Index: applications/editors/josm/i18n/build.xml
===================================================================
--- applications/editors/josm/i18n/build.xml	(revision 19246)
+++ applications/editors/josm/i18n/build.xml	(revision 19319)
@@ -10,7 +10,8 @@
   <property name="surveyor.srcfile"  value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
   <property name="i18n.build.dir"    value="build"/>
-  <property name="i18n.install.dir"  value="${josm.build.dir}/lib"/>
+  <property name="i18n.install.dir"  value="${josm.build.dir}/data"/>
+  <property name="i18n.oldinstall.dir" value="${josm.build.dir}/lib"/>
   <property name="i18n.name"         value="josm-translation"/>
-  <property name="i18n.jar"          value="${i18n.install.dir}/${i18n.name}.jar"/>
+  <property name="i18n.jar"          value="${i18n.oldinstall.dir}/${i18n.name}.jar"/>
 
   <property name="ant.build.javac.target" value="1.5"/>
@@ -59,8 +60,16 @@
   </target>
 
-  <target name="build" depends="po/josm.pot,init.gettext">
+  <target name="prebuild" depends="po/josm.pot,init.gettext">
+    <gettext-merge keysFile="josm.pot" poDirectory="po"/>
+  </target>
+
+  <target name="build" depends="prebuild">
+    <exec executable="perl">
+      <arg line="i18n.pl ${i18n.install.dir}/ po/*.po"/>
+    </exec>
+  </target>
+
+  <target name="buildold" depends="prebuild">
     <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
-
-    <gettext-merge keysFile="josm.pot" poDirectory="po"/>
 
     <!--<gettext-dist targetBundle="org.openstreetmap.josm.i18n.Translation"
Index: applications/editors/josm/i18n/i18n.pl
===================================================================
--- applications/editors/josm/i18n/i18n.pl	(revision 19319)
+++ applications/editors/josm/i18n/i18n.pl	(revision 19319)
@@ -0,0 +1,291 @@
+#! /usr/bin/perl -w
+
+use utf8;
+use encoding "utf8";
+use Term::ReadKey;
+use Encode;
+
+my $waswarn = 0;
+
+main();
+
+sub getdate
+{
+  my @t=gmtime();
+  return sprintf("%04d-%02d-%02d %02d:%02d+0000",
+  1900+$t[5],$t[4]+1,$t[3],$t[2],$t[1]);
+}
+
+sub loadfiles($@)
+{
+  my $desc;
+  my $all;
+  my ($lang,@files) = @_;
+  foreach my $file (@files)
+  {
+    die "Could not open file $file." if(!open FILE,"<:utf8",$file);
+    my $linenum = 0;
+
+    if($file =~ /\/(.._..)\.po$/ || $file =~ /\/(..)\.po$/)
+    {
+      my $l = $1;
+      ++$lang->{$l};
+      my %postate = (last => "", type => "");
+      my $linenum = 0;
+      print "Reading file $file\n";
+      while(<FILE>)
+      {
+        ++$linenum;
+        my $fn = "$file:$linenum";
+        chomp;
+        if($_ =~ /^#/ || !$_)
+        {
+          checkpo(\%postate, \%all, $l, "line $linenum in $file", $keys, 1);
+          $postate{fuzzy} = 1 if ($_ =~ /fuzzy/);
+        }
+        elsif($_ =~ /^"(.*)"$/) {$postate{last} .= $1;}
+        elsif($_ =~ /^(msg.+) "(.*)"$/)
+        {
+          my ($n, $d) = ($1, $2);
+          my $new = ($n eq "msgid" && $postate{type} ne "msgctxt") || ($n eq "msgctxt");
+          checkpo(\%postate, \%all, $l, "line $linenum in $file", $keys, $new);
+          $postate{last} = $d;
+          $postate{type} = $n;
+          $postate{src} = $fn if $new;
+        }
+        else
+        {
+          die "Strange line $linenum in $file: $_.";
+        }
+      }
+      checkpo(\%postate, \%all, $l, "line $linenum in $file", $keys, 1);
+    }
+    else
+    {
+      die "File format not supported for file $file.";
+    }
+    close(FILE);
+  }
+  return %all;
+}
+
+my $alwayspo = 0;
+my $alwaysup = 0;
+my $noask = 0;
+my $conflicts;
+sub copystring($$$$$$$)
+{
+  my ($data, $en, $l, $str, $txt, $context, $ispo) = @_;
+
+  $en = "___${context}___$en" if $context;
+
+  if(exists($data->{$en}{$l}) && $data->{$en}{$l} ne $str)
+  {
+    return if !$str;
+    if($l =~ /^_/)
+    {
+      $data->{$en}{$l} .= ";$str" if !($data->{$en}{$l} =~ /$str/);
+    }
+    elsif(!$data->{$en}{$l})
+    {
+      $data->{$en}{$l} = $str;
+    }
+    else
+    {
+
+      my $f = $data->{$en}{_file} || "";
+      $f = ($f ? "$f;".$data->{$en}{"_src.$l"} : $data->{$en}{"_src.$l"}) if $data->{$en}{"_src.$l"};
+      my $isotherpo = ($f =~ /\.po\:/);
+      my $pomode = ($ispo && !$isotherpo) || (!$ispo && $isotherpo);
+
+      my $mis = "String mismatch for '$en' **$str** ($txt) != **$data->{$en}{$l}** ($f)\n";
+      my $replace = 0;
+
+      if(($conflicts{$l}{$str} || "") eq $data->{$en}{$l}) {}
+      elsif($pomode && $alwaysup) { $replace=$isotherpo; }
+      elsif($pomode && $alwayspo) { $replace=$ispo; }
+      elsif($noask) { print $mis; ++$waswarn; }
+      else
+      {
+        ReadMode 4; # Turn off controls keys
+        my $arg = "(l)eft, (r)ight";
+        $arg .= ", (p)o, (u)pstream[ts/mat], all p(o), all up(s)tream" if $pomode;
+        $arg .= ", e(x)it: ";
+        print "$mis$arg";
+        while((my $c = getc()))
+        {
+          if($c eq "l") { $replace=1; }
+          elsif($c eq "r") {}
+          elsif($c eq "p" && $pomode) { $replace=$ispo; }
+          elsif($c eq "u" && $pomode) { $replace=$isotherpo; }
+          elsif($c eq "o" && $pomode) { $alwayspo = 1; $replace=$ispo; }
+          elsif($c eq "s" && $pomode) { $alwaysup = 1; $replace=$isotherpo; }
+          elsif($c eq "x") { $noask = 1; ++$waswarn; }
+          else { print "\n$arg"; next; }
+          last;
+        }
+        print("\n");
+        ReadMode 0; # Turn on controls keys
+      }
+      if(!$noask)
+      {
+        if($replace)
+        {
+          $data->{$en}{$l} = $str;
+          $conflicts{$l}{$data->{$en}{$l}} = $str;
+        }
+        else
+        {
+          $conflicts{$l}{$str} = $data->{$en}{$l};
+        }
+      }
+    }
+  }
+  else
+  {
+    $data->{$en}{$l} = $str;
+  }
+}
+
+sub checkpo($$$$$$)
+{
+  my ($postate, $data, $l, $txt, $keys, $new) = @_;
+
+  if($postate->{type} eq "msgid") {$postate->{msgid} = $postate->{last};}
+  elsif($postate->{type} eq "msgid_plural") {$postate->{msgid_1} = $postate->{last};}
+  elsif($postate->{type} =~ /^msgstr(\[0\])?$/) {$postate->{msgstr} = $postate->{last};}
+  elsif($postate->{type} =~ /^msgstr\[(.+)\]$/) {$postate->{"msgstr_$1"} = $postate->{last};}
+  elsif($postate->{type} eq "msgctxt") {$postate->{context} = $postate->{last};}
+  elsif($postate->{type}) { die "Strange type $postate->{type} found\n" }
+
+  if($new)
+  {
+    if((!$postate->{fuzzy}) && $postate->{msgstr} && $postate->{msgid})
+    {
+      copystring($data, $postate->{msgid}, $l, $postate->{msgstr},$txt,$postate->{context}, 1);
+      for($i = 1; exists($postate->{"msgstr_$i"}); ++$i)
+      { copystring($data, $postate->{msgid}, "$l.$i", $postate->{"msgstr_$i"},$txt,$postate->{context}, 1); }
+      if($postate->{msgid_1})
+      { copystring($data, $postate->{msgid}, "en.1", $postate->{msgid_1},$txt,$postate->{context}, 1); }
+      copystring($data, $postate->{msgid}, "_src.$l", $postate->{src},$txt,$postate->{context}, 1);
+    }
+    elsif($postate->{msgstr} && !$postate->{msgid})
+    {
+      my %k = ($postate->{msgstr} =~ /(.+?): +(.+?)\\n/g);
+      # take the first one!
+      for $a (sort keys %k)
+      {
+        $keys->{$l}{$a} = $k{$a} if !$keys->{$l}{$a};
+      }
+    }
+    foreach my $k (keys %{$postate})
+    {
+      delete $postate->{$k};
+    }
+    $postate->{type} = $postate->{last} = "";
+  }
+}
+
+sub createlang($@)
+{
+  my ($data, @files) = @_;
+  foreach my $file (@files)
+  {
+    my $la;
+    if($file =~ /[-_](.._..)\.lang$/ || $file =~ /^(?:.*\/)?(.._..)\.lang$/ ||
+    $file =~ /[-_](...?)\.lang$/ || $file =~ /^(?:.*\/)?(..)\.lang$/)
+    {
+      print "Creating file $file\n";
+      $la = $1;
+    }
+    else
+    {
+      die "Language for file $file unknown.";
+    }
+    die "Could not open outfile $file\n" if !open FILE,">:raw",$file;
+
+    foreach my $en (sort keys %{$data})
+    {
+      next if $data->{$en}{"en.1"};
+      my $val;
+      if($la eq "en")
+      {
+        $val = $en;
+        $val =~ s/^___(.*)___/_:$1\n/;
+      }
+      else
+      {
+        my $ennoctx = $en;
+        $ennoctx =~ s/^___(.*)___//;
+        $val = (exists($data->{$en}{$la})) ? $data->{$en}{$la} : "";
+        $val = "" if($ennoctx eq $val);
+      }
+      $val = encode("utf8", $val);
+      print FILE pack("n",length($val)).$val;
+    }
+    print FILE pack "n",0xFFFF;
+    foreach my $en (sort keys %{$data})
+    {
+      next if !$data->{$en}{"en.1"};
+      my $num;
+      for($num = 1; exists($data->{$en}{"$la.$num"}); ++$num)
+      { }
+      my $val;
+      if($la eq "en")
+      {
+        $val = $en;
+        $val =~ s/^___(.*)___/_:$1\n/;
+      }
+      else
+      {
+        $val = (exists($data->{$en}{$la})) ? $data->{$en}{$la} : "";
+        --$num if(!$val);
+        if($num == 2)
+        {
+          my $ennoctx = $en;
+          $ennoctx =~ s/^___(.*)___//;
+          $num = 0 if $val eq $ennoctx && $data->{$en}{"$la.1"} eq $data->{$en}{"en.1"};
+        }
+      }
+
+      print FILE pack "C",$num;
+      if($num)
+      {
+        $val = encode("utf8", $val);
+        print FILE pack("n",length($val)).$val;
+        for($num = 1; exists($data->{$en}{"$la.$num"}); ++$num)
+        {
+          $val = encode("utf8", $data->{$en}{"$la.$num"});
+          print FILE pack("n",length($val)).$val;
+        }
+      }
+    }
+    close FILE;
+  }
+}
+
+sub main
+{
+  my %lang;
+  my @po;
+  my $basename = shift @ARGV;
+  foreach my $arg (@ARGV)
+  {
+    foreach my $f (glob $arg)
+    {
+      if($f =~ /\*/) { printf "Skipping $f\n"; }
+      elsif($f =~ /\.po$/) { push(@po, $f); }
+      else { die "unknown file extension."; }
+    }
+  }
+  my %data = loadfiles(\%lang,@po);
+  my @clang;
+  foreach my $la (sort keys %lang)
+  {
+    push(@clang, "${basename}$la.lang");
+  }
+  push(@clang, "${basename}en.lang");
+  die "There have been warning. No output.\n" if $waswarn;
+
+  createlang(\%data, @clang);
+}
Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 19246)
+++ applications/editors/josm/i18n/po/ar.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,7 +12,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-28 13:57+0000\n"
-"Last-Translator: metehyi <Unknown>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:05+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +21,9 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:22+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
@@ -89,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -294,4 +294,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "تابع"
@@ -322,5 +323,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -336,7 +337,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -468,6 +472,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -546,5 +551,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -558,5 +563,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "المعلومات"
@@ -751,15 +756,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "أحذف"
@@ -837,6 +842,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1477,14 +1482,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "التفضيلات..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+msgid "Open a preferences dialog for global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "التفضيلات"
@@ -1625,17 +1630,17 @@
 msgstr "المساعدة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "تقرير عن الحالة"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1772,43 +1777,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "إختر أي من :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1818,9 +1823,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1828,5 +1833,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1991,4 +1996,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "السابق"
@@ -3169,24 +3176,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "التفضيلات المخزنة على {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3195,5 +3202,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3204,5 +3211,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3624,6 +3631,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3793,5 +3800,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3806,10 +3813,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "من النوع طريق"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3817,15 +3824,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "مجرى مياه"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "إستعمال الأرض"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3842,6 +3849,11 @@
 msgstr[5] "{0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "النقل المشترك"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3850,5 +3862,5 @@
 msgstr[1] "{0} أعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3890,9 +3902,17 @@
 msgstr "التناقض"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+msgid "Authentication Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+msgid "Authorisation Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "مضيف غير معروف"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -3992,65 +4012,65 @@
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "عيّن اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4059,9 +4079,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4069,25 +4089,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4100,5 +4120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4107,5 +4127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4213,5 +4233,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4869,5 +4889,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4882,5 +4902,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4888,5 +4908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4976,5 +4996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr ""
@@ -5158,5 +5178,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5168,5 +5188,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5261,5 +5281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5268,5 +5288,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5347,13 +5367,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "أضِف"
@@ -5484,54 +5504,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "إفتح لائحة بكل العلاقات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "إفتح محرر نص للعلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "أمحي العلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "أنشئ علاقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6866,58 +6886,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6925,58 +6945,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6984,9 +7004,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -6994,5 +7014,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7000,15 +7020,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7016,9 +7036,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7027,5 +7047,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7052,9 +7072,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "الأساسي"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7064,5 +7085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7073,5 +7094,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7113,22 +7134,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7137,10 +7160,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7149,10 +7172,10 @@
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "غيّر القيم ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7161,5 +7184,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7168,9 +7191,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
@@ -7198,61 +7221,57 @@
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "الخيار"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "حدد خيارات رسم الخطوط"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "حدد خيارات رسم الخطوط"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "حدد خيارات رسم الخطوط"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7308,5 +7327,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7320,11 +7339,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7935,6 +7954,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8976,6 +8996,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9061,9 +9081,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9085,4 +9104,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9522,24 +9548,24 @@
 msgstr[5] "{0} نقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "خطء عند تحليل {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "لم أتمكن من قراءة \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9548,34 +9574,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9583,114 +9609,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9698,38 +9726,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9738,5 +9766,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9745,56 +9773,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "جاري قراءة {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9806,22 +9834,22 @@
 msgstr[5] "صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10009,4 +10037,573 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "إستعمل الإعدادات العامة."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "المؤلفين"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "قناة"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "إسم المستخدم"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "كلمة‌المرور"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+msgid "Granted rights"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "أضف صفة"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "المؤلفين"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "الرجاء إدخال إسم المستخدم"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "الرجاء إدخال إسم المستخدم"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "التفضيلات المتقدمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "الرجاء إدخال إسم المستخدم"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "الرجاء إدخال إسم المستخدم"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "الرجاء إختيار على الأقل عقدة أو طريق"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "لم أجد شيء مطابق لِــ ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "أغلق الحوار و الغي التنزيل"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "أغلق الحوار و أنشئ عقدة جديدة"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "حمّل التفضيلات"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "بيع بلمفرق"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "مطعم"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "نقطة دخول طوارئ"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+msgid "Success"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+msgid "Test failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "السلسلة؛السلسلة؛..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10038,5 +10635,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10044,5 +10641,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10050,7 +10647,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr ""
@@ -10486,12 +11083,4 @@
 msgstr "المعطيات أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10530,17 +11119,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "الشكل و المظهر"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "الغيابي (محدد تلقائياً)"
@@ -10607,10 +11191,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "أغلق الحوار و أنشئ عقدة جديدة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+msgid "Save the preferences and close the dialog"
+msgstr ""
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "إعدادات المعراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10618,29 +11211,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "إعدادات الاتصال"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "تعيينات الإتصال للخادم أو.أس.أم."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "إعدادات الخريطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "إعدادت إسقاط الخريطة و تفسير المعطيات."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "تعيينات الصوت"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -10668,86 +11261,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "حصر"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "إعدادات الوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL الخادم الأساسي"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "كلمة المرور أو.أس.أم"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11023,4 +11558,249 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "إعدادات الاتصال"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "إستعمل الغيابي"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "كلمة المرور أو.أس.أم"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "التفضيلات"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL الخادم الأساسي"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "القيمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "القيمة الحالية هي الغيابية."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11168,5 +11948,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11218,23 +11998,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11243,16 +12029,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11260,5 +12046,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11266,5 +12052,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11498,5 +12284,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11540,5 +12326,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11586,30 +12372,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11768,4 +12554,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12061,23 +12862,28 @@
 msgstr "إستحالة الإتصال بالخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "جاري قراءة {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12441,5 +13247,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12448,5 +13254,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12456,5 +13262,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12464,5 +13270,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12471,5 +13302,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12478,5 +13309,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12485,9 +13316,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12496,5 +13327,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12504,5 +13335,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12511,5 +13342,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12518,5 +13349,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12525,10 +13356,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12537,10 +13368,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12551,5 +13382,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12559,5 +13390,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12568,18 +13399,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12606,4 +13424,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -12987,5 +13811,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13036,5 +13860,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13043,25 +13873,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13070,13 +13898,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13084,34 +13912,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "تمكين الإخباء التلقائي"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "حجم الخابية الأقصى (م. بايت)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13123,18 +13951,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13142,5 +13970,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13148,44 +13976,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13296,5 +14124,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13302,14 +14130,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13317,14 +14145,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13332,21 +14160,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13455,28 +14283,28 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13485,47 +14313,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "خطء في صيغة المعطيات"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13687,6 +14515,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr ""
@@ -13913,33 +14741,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr ""
@@ -13979,5 +14807,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -13988,80 +14816,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "الماء"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "حجم الخابية الأقصى (م. بايت)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "عُمر الخابية الأقصى (أيام)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14069,5 +14897,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14075,5 +14903,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14081,50 +14909,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "الحجم الأقصى لكل مجلد خابية بلــبايت. الحجم الغيابي هو 300 م. بايت"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "العُمر الأقصى لكل مجلد خابية بلــبايت. العُمر الغيابي هو 100 يوم"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14334,5 +15162,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14357,5 +15185,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14370,14 +15197,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "إفتح OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14385,22 +15220,31 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "أضف تعليق"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "ادخل تعليقك"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "شائع"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "اغلق فعلاً ؟"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14408,23 +15252,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "اغلق"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "أوصف المشكلة بدقة"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "أنشئ مساحات"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "الرجاء إدخال إسم المستخدم"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "إفتح OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14446,10 +15318,10 @@
 msgstr "إمتداد الملف غير معروف: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14457,5 +15329,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14465,37 +15337,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "غيّر الخيار"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "التحم عن بعد"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14504,5 +15376,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "الأفعال المسموح بها"
@@ -14616,25 +15488,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14680,42 +15552,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -14945,37 +15817,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -14983,5 +15855,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15581,5 +16453,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr ""
@@ -15593,5 +16465,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -15983,55 +16855,55 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17565,6 +18437,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17590,6 +18462,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17615,6 +18487,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr ""
@@ -17640,6 +18512,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr ""
@@ -17653,5 +18525,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17669,5 +18541,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr ""
@@ -17701,6 +18573,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17734,6 +18606,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17783,5 +18655,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr ""
@@ -18767,5 +19639,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20164,7 +21036,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "شارع"
@@ -20892,28 +21764,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "الرياضة"
@@ -22608,4 +23480,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22640,9 +23520,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "خضار"
@@ -24050,7 +24930,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr ""
@@ -24120,7 +25000,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24146,5 +25026,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr ""
@@ -24440,5 +25320,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "مهجور"
@@ -24480,5 +25360,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "خيل"
@@ -24588,4 +25468,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24623,5 +25509,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24694,11 +25580,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24761,5 +25647,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24815,7 +25701,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24886,9 +25772,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "سكة حديد"
@@ -24980,5 +25866,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -24992,5 +25878,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25011,10 +25897,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "مستديرة دوران"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25024,5 +25910,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25037,5 +25923,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "شاطئ نهر"
@@ -25049,5 +25935,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "جدول نهر"
@@ -25061,5 +25947,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "حوض سفن"
@@ -25248,13 +26134,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -25316,7 +26202,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25339,10 +26225,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25378,7 +26264,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "سكة حديد قديمة"
@@ -25424,6 +26310,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25437,5 +26323,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25457,5 +26343,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25469,5 +26355,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25529,7 +26415,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "خط جوي"
@@ -25546,5 +26432,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25559,5 +26445,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25572,5 +26458,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25585,5 +26471,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25598,5 +26484,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25611,5 +26497,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25729,11 +26615,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "طاقة"
@@ -25747,5 +26633,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -25759,5 +26645,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -25901,13 +26787,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -25921,5 +26807,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "مارينا"
@@ -26015,10 +26901,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26120,14 +27006,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26523,5 +27416,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26546,23 +27439,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26594,6 +27487,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26654,8 +27547,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "صحة"
@@ -27008,26 +27901,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "متجر/دكان"
@@ -27099,8 +27992,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "فندق"
@@ -27171,5 +28064,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27178,5 +28071,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27186,5 +28079,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27193,5 +28086,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27201,9 +28094,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "سياحة"
@@ -27291,14 +28184,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "تاريخي"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27307,5 +28199,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -27319,5 +28211,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27339,5 +28231,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "حوض"
@@ -27351,5 +28243,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "غابة"
@@ -27363,5 +28255,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -27384,5 +28276,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -27396,5 +28288,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "صناعي"
@@ -27408,5 +28300,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27420,5 +28312,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -27432,5 +28324,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27487,7 +28379,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "عسكري"
@@ -27501,5 +28393,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -27512,5 +28404,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "قمّة"
@@ -27525,5 +28417,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -27537,5 +28429,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "بركان"
@@ -27590,8 +28482,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "طبيعي"
@@ -27605,5 +28497,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -27617,5 +28509,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "أرض بور"
@@ -27629,5 +28521,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27641,5 +28533,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "طين"
@@ -27653,5 +28545,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "شاطئ"
@@ -27729,8 +28621,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "طريق"
@@ -27753,4 +28645,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27778,7 +28711,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "الحدود"
@@ -27928,11 +28866,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "المكان"
@@ -27980,6 +28918,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "العنوان"
@@ -28335,4 +29273,8 @@
 msgstr ""
 
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
+
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
@@ -28670,7 +29612,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
 
 #~ msgid "Directly load TCX files from JOSM."
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 19246)
+++ applications/editors/josm/i18n/po/bg.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,5 +12,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
 "PO-Revision-Date: 2009-12-23 19:35+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -299,4 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Продължи"
@@ -327,5 +328,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -341,7 +342,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -475,6 +479,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -553,5 +558,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -565,5 +570,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Информация"
@@ -762,15 +767,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Изтриване"
@@ -849,6 +854,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1501,14 +1506,15 @@
 msgstr[1] "за {0} примитива"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Настройки…"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Отваряне страница с предпочитания за глобалните параметри."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Настройки"
@@ -1655,17 +1661,17 @@
 msgstr "Помощ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Статус Репорт"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Копиране в клипборда и затваряне"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1812,34 +1818,34 @@
 msgstr "Тази точка не е свързана с към нещо друго."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Никой от тези точки не са прикрепени за нещо друго."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Нито една от тези тези линии не е прикрепена за други"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Текущато избраните обекти не може да се разсъединят."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Изберете един от вариантите:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Един маркиран възел, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Една точка, която се използва от няколко линии, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Една точка, която се използва от няколко линии и една от тези линии, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1847,5 +1853,5 @@
 "* Една линия, която има точки, които се използват от няколко линии, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1854,5 +1860,5 @@
 "няколко линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1865,9 +1871,9 @@
 "дублирани възли и всички възли ще бъдат избрани."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Незапелен възел"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1875,5 +1881,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2040,4 +2046,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Назад"
@@ -3264,24 +3272,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Предпочитанията са записани на {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Невъзможно да се качат предпочитанията. Причина: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Невъзможно да се заредят предпочитанията от сървъра."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3290,5 +3298,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3301,5 +3309,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3713,6 +3721,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3880,5 +3888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3893,10 +3901,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "път / магистрала"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3904,15 +3912,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "водоеми"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "земеползване"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3925,6 +3933,11 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Обществен транспорт"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3933,5 +3946,5 @@
 msgstr[1] "{0} члена"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3973,9 +3986,19 @@
 msgstr "Конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Неуспешна връзка"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Неуспешна връзка"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Неизвестен хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Обектът е изтрит"
@@ -4081,65 +4104,65 @@
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Отваряне на файл (како GPS данни, ако е .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Избор език."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/път/към/папката/на/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4148,9 +4171,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4160,25 +4183,25 @@
 "че зареждате данни преди --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> може да укажете osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Активиране обновените разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Настройки по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4191,5 +4214,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4198,5 +4221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4304,5 +4327,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Потребител:"
@@ -4970,5 +4993,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4983,5 +5006,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4989,5 +5012,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5077,5 +5100,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "няма/никой"
@@ -5255,5 +5278,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5265,5 +5288,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5358,5 +5381,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5365,5 +5388,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5444,13 +5467,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Добави"
@@ -5581,54 +5604,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Връзки"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Отваряне списъка с всички релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Връзки: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Редактиране на релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Изтриване на избраната връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Създаване на нова релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6965,58 +6988,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7024,58 +7047,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7083,9 +7106,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7093,5 +7116,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7099,15 +7122,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7115,9 +7138,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7126,5 +7149,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7151,9 +7174,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Основен"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7163,5 +7187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7172,5 +7196,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7212,22 +7236,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7236,10 +7262,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7248,10 +7274,10 @@
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Промени стойностите?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7260,5 +7286,5 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7267,9 +7293,9 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Изберете стойност"
@@ -7297,61 +7323,57 @@
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Промяна на връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Изтриване от връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Изтриване на {0} отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Не е избрана връзка"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Избиране варианти за чертане на линиите."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Избиране варианти за чертане на линиите."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7409,5 +7431,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7421,12 +7443,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Зареждане на родителите на релация {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8040,6 +8062,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9097,6 +9120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9182,9 +9205,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9206,4 +9228,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9641,24 +9670,24 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Файлове (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файлът {0} е зареден вече под името \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Грешка при разбор {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Не може да се прочете \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9670,34 +9699,34 @@
 "изберете времева зона<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Време на снимката (от EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Gps време (прочетено от снимката по-горе): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Намирам се в часовата зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Без дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Отваряне друга снимка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизиране време от снимка на GPS приемник"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9707,114 +9736,116 @@
 "Моля използвайте изисквания формат!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Невалидна дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Няма още GPX следи заредени>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX следа: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Отвори друга GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Авто-отгатване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Часова зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Отместване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Съпоставяне на изображения с GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Корелнутииране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Невалидна часова зона"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Невалидно отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часови пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минути: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9822,38 +9853,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Съотнасянето на снимки към следа се провали"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Настройване часови пояс и отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Избраните снимки не съдържат времева информация."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Снимките не съдържат времева информация"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX следата няма информация за времето"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Трябва да изберете GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Няма избрана GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9864,5 +9895,5 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9873,56 +9904,56 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извличане на GPS координати от EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Започване на преглед на директории"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Прочитане на снимки..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Четене {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Невъзможно да се вземе каноничното име на директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканиране на директория {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Намерен е празен файл в директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Корелиране към GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9930,22 +9961,22 @@
 msgstr[1] "изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} открити с gps тагове."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10141,4 +10172,579 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Използвай глобалните настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Автори"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Канал"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Потребителско име"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Парола"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Завърти надясно"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Добавяне на параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Автори"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Моля, въведете потребителско име"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Моля, въведете потребителско име"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Неуспешна иницилизация на API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Достъп"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Разширени настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Моля, въведете потребителско име"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Моля, въведете потребителско име"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Моля изберете поне един възел или път."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Не е намерено съвпадение за ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Параметри при качване"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Изискване на обновяване"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Ресторант"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Натиснете за да премахнете цел."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Пункт за връзка със спешна помощ"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Натиснете за да премахнете цел."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Достъп"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Неуспешно обновяване."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "низ;низ;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10172,5 +10778,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10178,5 +10784,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10184,7 +10790,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Моля, изберете ред за изтриване."
@@ -10652,12 +11258,4 @@
 msgstr "OSM Данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Съхраняване резервни копия"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "При запис, оставяй резервни копия на файловете завършващи с ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10696,17 +11294,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Външен вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Език"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "По подразбиране (Автоматично определени)"
@@ -10773,10 +11366,19 @@
 msgstr "Настройка сайтове за разширения"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Настройки на дисплея"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10784,29 +11386,29 @@
 msgstr "Различни настройки, влияещи на външния вид на програмата."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Настройки на връзката"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Параметри на връзката с OSM сървъра."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Настройки на картата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Параметри на проекцията на картата и интерпретацията на данните."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Аудио настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Параметри за звуковия плейър и звуковите маркери."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -10835,88 +11437,28 @@
 "Проекцията {0} не може да бъде активирана. Използва се меркаторска проекция."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Атракция"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Настройки на прокси"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Основен URL адрес на OSM сървъра (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата "
-"парола."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Основен URL адрес на сървъра"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM парола"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11220,4 +11762,256 @@
 msgstr "Група модификатори"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Невалиден URL?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Пропадна инициализацията на връзката със сървъра на OSM {0}."
+"<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
+"Интернет.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Връзката се разпадна."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Използване на стойностите по подразбиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Съхраняване резервни копия"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "При запис, оставяй резервни копия на файловете завършващи с ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM потребителско име (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM парола"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с "
+"настройките.<br>Паролата се предава като обикновен текст до сървъра, "
+"включена в URL адрес.<br><b>Не използвайте ценна парола.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Основен URL адрес на сървъра"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Проверка"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Текуща стойност по подразбиране."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11361,5 +12155,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11411,23 +12205,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11436,16 +12236,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11453,5 +12253,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11459,5 +12259,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11693,5 +12493,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11735,5 +12535,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11781,30 +12581,30 @@
 msgstr "ОК - нов опит"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11963,4 +12763,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12259,23 +13074,28 @@
 "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Четене {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12660,5 +13480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12670,5 +13490,5 @@
 "Интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12678,5 +13498,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12686,5 +13506,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12693,5 +13538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12700,5 +13545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12707,9 +13552,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12718,5 +13563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12726,5 +13571,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12733,5 +13578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12740,5 +13585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12747,10 +13592,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12759,10 +13604,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12773,5 +13618,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12781,5 +13626,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12790,18 +13635,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12828,4 +13660,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13216,5 +14054,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13265,5 +14103,11 @@
 msgstr "CadastreGrabber: Невалидно url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13272,25 +14116,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Избери от..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Избор на комуна"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Избери от..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Кадастър"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Авто-определяне източници"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13299,13 +14141,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13313,34 +14155,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Замени оригиналния фон с фонов цвят от JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Обърни сивите цветове (за черни фонове)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Заване на прозрачен фон."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Обозначване на границите на зона със свалени данни."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Включване автоматично кеширане."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Макс. размер на кеша (в MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13358,9 +14200,9 @@
 "данни създадени с това разширение."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Френски кадастров WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13368,10 +14210,10 @@
 "източници е включено</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Източник"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13380,5 +14222,5 @@
 "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13388,45 +14230,45 @@
 "текстове на тъмни фонове."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Позволяване на подреждане в няколко слоя"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Фиксирана площ (по подразбиране 100m2)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Фиксирана размер (от 25 до 1000 метра)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13540,5 +14382,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13546,14 +14388,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13561,14 +14403,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13576,21 +14418,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Изток"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Север"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13703,28 +14545,28 @@
 msgstr "Празен слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Не е векоторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Размер на растера: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Векторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13735,47 +14577,47 @@
 "Моля, създайте нов кеш."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Грешка на кеш формата"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Грешка в кеширането на Ламбертовата зона"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Използване"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Моля, изберете схема за използване."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Цветова схема"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Моля, изберете схема за изтриване."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Изполвайте избраната от списъка схема."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Използвайте текущите цветове като нова цветова схема."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Изтриване на избраната схема от списъка."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Цветни схеми"
@@ -13939,6 +14781,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Обновяване"
@@ -14168,33 +15010,33 @@
 msgstr "Възникна непозната грешка"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "изток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "североизток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "север"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "северозапад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "югозапад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "юг"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "югоизток"
@@ -14234,5 +15076,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14243,80 +15085,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "вода"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "брегова линия"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "земя"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Максимален брой сегменти за един път"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Максимален брой възли в началната следа"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Най-светлия отенък на сивото, който да се смяната за вода (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Точно на опростяването на линии (в градуси)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Разрешителна способност на Landsat изображенията (точки на градус)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Размер на Landsat изображенията (точки)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Преместване всички следи на изток (в градуси)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Преместване всички следи на север (в градуси)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Посока в която да се търси земя"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Маркирай пътищата като"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS Слой"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Макс.размер на кеша (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Съхраняване кеш (дни)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Изходен текст"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Максимален брой сегменти в създаваните линии. По подразбиране 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14326,5 +15168,5 @@
 "подразбиране 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14334,5 +15176,5 @@
 "Може да бъде 0-255. По подразбиране 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14343,5 +15185,5 @@
 "подразбиране 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14349,50 +15191,50 @@
 "Резолюция на Landsat изображенията, в точки на градус. По подразбиране 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 "Размер на landsat изображение, измервано в точки. По подразбиране 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 "Отместване на всички точки в посока Изток (градуси). По подразбиране 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 "Отместване на всички точки в посока Север (градуси). По подразбиране 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Посока за търсене на земя. По подразбиране изток."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 "Маркирай линиите като вода, крайбрежие, земя или нищо. По подразбиране вода."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Кой WMS слой да използваме за трасиране. По подразбиране IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Максимален размер на всяка кеш директория в байтове. По подразбиране 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Макс. възраст на всеки кеш файл (в дни). По подразбиране 100 дни."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Източник на данни. По подразбиране Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Разширение за трасировка на водоеми по Landsat изображения."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakewalker Настройки на разширението"
@@ -14604,5 +15446,5 @@
 msgstr "Цикъл на сваляне от OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Показване на проблеми от OpenStreetBugs"
@@ -14629,5 +15471,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14644,14 +15485,22 @@
 "един низ."
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Отваряне на OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14661,22 +15510,31 @@
 "от OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Добавете коментар"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Въведете вашия коментар"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Общи"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Маркирайте \"направено\""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Действително да затворим?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14686,23 +15544,51 @@
 "да добавите опционално коментар:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Затваряне"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Нов проблем"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Създаване на нов проблем"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Опишете проблема колкото можете по-подробно"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Корелнутииране"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Моля, въведете потребителско име"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Неизвестен статус на проблема"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Отваряне на OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14724,10 +15610,10 @@
 msgstr "Непознато разширение на файл: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14737,5 +15623,5 @@
 "\"Картови настройки\" (Map Settings) от настройките."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "изпълним файл на Firefox"
@@ -14745,38 +15631,38 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "зареждане данни от API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "промяна на селекцията"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "промяна областта видима на екрана"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "ръчно потвърждаване на всички действия на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Разширение, което позволява JOSM да бъде управляван от други приложения."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Дистанционно"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Настройки на разширението за дистанционно управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14788,5 +15674,5 @@
 "за да се свързват с него."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Позволени действия"
@@ -14903,25 +15789,25 @@
 msgstr "Изчистване маршрут"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Настройки на разширение маршрутизатор"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Настройване предпочитания за маршрутизиране"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Клас път"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Скорост (км/ч)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Тегло"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Въведете стойности за тегло"
@@ -14967,42 +15853,42 @@
 msgstr "изображение "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "автомащабиране"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "автозараждане квадранти"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Настройки на разширение SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Източници на квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Авто мащаб: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Автозареждане Квадранти: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Макс.мащаб ниво: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Фон при избледняване: "
@@ -15239,37 +16125,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Използване на списък за пропускане."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Използване на списъка за пропускане за подтискане на предупреждения."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Изпозване на слой за грешки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Изпозване на слой за грешки за показване на проблемите елементи."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Показване информационното ниво при качване."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Показване на проверките извършвани при качване."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "При нужда"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "При качване"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15279,5 +16165,5 @@
 "грешки правени от потребители и програми за редактиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Проверка на данни"
@@ -15893,5 +16779,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "сграда"
@@ -15905,5 +16791,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "област"
@@ -16305,55 +17191,55 @@
 msgstr "Отворете празен WMS слой за да заредите данни от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модул WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Име на меню"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Име на меню (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (по подразбиране)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Въведете име на меню и WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Моля, изберете поне един ред за копиране"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17923,6 +18809,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "автомагистрала"
@@ -17948,6 +18834,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
@@ -17973,6 +18859,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "главен / първокласен"
@@ -17998,6 +18884,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "второкласен"
@@ -18011,5 +18897,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "третокласен"
@@ -18027,5 +18913,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "улица"
@@ -18059,6 +18945,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "служебна"
@@ -18092,6 +18978,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "ремонт"
@@ -18141,5 +19027,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "кръгово"
@@ -19125,5 +20011,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "блато"
@@ -20522,7 +21408,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "улица"
@@ -21250,28 +22136,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "спорт"
@@ -22966,4 +23852,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22998,9 +23892,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "зеленина"
@@ -24408,7 +25302,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "велосипед"
@@ -24478,7 +25372,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "пеш"
@@ -24504,5 +25398,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "метро"
@@ -24798,5 +25692,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -24838,5 +25732,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "кон"
@@ -24946,4 +25840,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24981,5 +25881,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25052,11 +25952,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "бариера"
@@ -25119,5 +26019,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "автомобилен път"
@@ -25173,7 +26073,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "път_от_пътна_мрежа"
@@ -25244,9 +26144,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "ЖП"
@@ -25338,5 +26238,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "услуги"
@@ -25350,5 +26250,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "форд"
@@ -25369,10 +26269,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "обръщало"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25382,5 +26282,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "точка за връзка със спешна помощ"
@@ -25395,5 +26295,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "речен бряг"
@@ -25407,5 +26307,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "поток"
@@ -25419,5 +26319,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "док"
@@ -25606,13 +26506,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "изкуствени съоръжения"
@@ -25674,7 +26574,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "ЖП точка"
@@ -25697,10 +26597,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "друга ЖП линия"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "ЖП railover"
@@ -25736,7 +26636,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "стара ЖП линия"
@@ -25782,6 +26682,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "въздушен транспорт"
@@ -25795,5 +26695,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "терминал"
@@ -25815,5 +26715,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "Надземен_транспорт_тъмен"
@@ -25827,5 +26727,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "Надземен_транспорт_светъл"
@@ -25887,7 +26787,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "надземен транспорт"
@@ -25904,5 +26804,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "лесна ски писта"
@@ -25917,5 +26817,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "средно трудна ски писта"
@@ -25930,5 +26830,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "ски писта за напреднали"
@@ -25943,5 +26843,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "ски писта за експерти"
@@ -25956,5 +26856,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "ски писта freeride"
@@ -25969,5 +26869,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "ски писта за начинаещи"
@@ -26087,11 +26987,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "захранване"
@@ -26105,5 +27005,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "кей"
@@ -26117,5 +27017,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "тръбопровод"
@@ -26259,13 +27159,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "отдих и развлечение"
@@ -26279,5 +27179,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "яхт пристан"
@@ -26373,10 +27273,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "Обществени услуги"
@@ -26478,14 +27378,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "Обществен трафик"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26881,5 +27788,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26904,23 +27811,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "Обществено осветление"
@@ -26952,6 +27859,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "светла_вода"
@@ -27012,8 +27919,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "здравеопазване"
@@ -27366,26 +28273,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "магазин"
@@ -27457,8 +28364,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "хотел"
@@ -27529,5 +28436,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27536,5 +28443,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27544,5 +28451,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27551,5 +28458,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27559,9 +28466,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "туризъм"
@@ -27649,14 +28556,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "исторически"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27665,5 +28571,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "кариера"
@@ -27677,5 +28583,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "сметище"
@@ -27697,5 +28603,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "басейн"
@@ -27709,5 +28615,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "гора"
@@ -27721,5 +28627,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "двор ферма"
@@ -27742,5 +28648,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "търговия на дребно"
@@ -27754,5 +28660,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "индустрия"
@@ -27766,5 +28672,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -27778,5 +28684,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "зелена площ"
@@ -27790,5 +28696,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "ЖП"
@@ -27845,7 +28751,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "военни"
@@ -27859,5 +28765,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "гробище"
@@ -27870,5 +28776,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "връх"
@@ -27883,5 +28789,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "ледник"
@@ -27895,5 +28801,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "вулкан"
@@ -27948,8 +28854,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "природа"
@@ -27963,5 +28869,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "храсталак"
@@ -27975,5 +28881,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "пустош"
@@ -27987,5 +28893,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "гориста местност"
@@ -27999,5 +28905,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "кал"
@@ -28011,5 +28917,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "плаж"
@@ -28087,8 +28993,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "маршрут"
@@ -28111,4 +29017,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28136,7 +29083,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "граница"
@@ -28286,11 +29238,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "място"
@@ -28338,6 +29290,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "адрес"
@@ -28693,4 +29645,13 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Основен URL адрес на OSM сървъра (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата "
+#~ "парола."
+
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -28889,7 +29850,4 @@
 #~ msgid "Sync clock"
 #~ msgstr "Синхронизация часовник"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM потребителско име (email)"
 
 #~ msgid "Proxy server host"
@@ -29179,13 +30137,4 @@
 #~ msgstr "Потребителско име (email) за OSM акаунт."
 
-#~ 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>ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с "
-#~ "настройките.<br>Паролата се предава като обикновен текст до сървъра, "
-#~ "включена в URL адрес.<br><b>Не използвайте ценна парола.</b></html>"
-
 #~ msgid "Tagging preset source"
 #~ msgstr "Източник на шаблони за маркиране"
@@ -29363,7 +30312,4 @@
 #~ msgstr "Импортиране на TCX Файл..."
 
-#~ msgid "Request Update"
-#~ msgstr "Изискване на обновяване"
-
 #~ msgid "Show Tile Status"
 #~ msgstr "Показване статуса на квадрант"
@@ -29380,7 +30326,4 @@
 #~ msgid "All images"
 #~ msgstr "Всички изображения"
-
-#~ msgid "Validate"
-#~ msgstr "Проверка"
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
@@ -29621,7 +30564,4 @@
 #~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
 
-#~ msgid "API initialization failed"
-#~ msgstr "Неуспешна иницилизация на API"
-
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -29655,7 +30595,4 @@
 #~ msgid "Download referrers from OSM..."
 #~ msgstr "Сваляне на референтните данни от OSM."
-
-#~ msgid "Update failed"
-#~ msgstr "Неуспешно обновяване."
 
 #~ msgid "Conflict detected"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 19246)
+++ applications/editors/josm/i18n/po/cs.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,7 +12,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-28 10:58+0000\n"
-"Last-Translator: Aleš Janda <kyblicek@kyblsoft.cz>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-03 17:58+0000\n"
+"Last-Translator: hanoj <ehanoj@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -295,4 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Pokračovat"
@@ -323,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -337,7 +338,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -471,6 +475,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -549,5 +554,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -561,5 +566,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informace"
@@ -757,15 +762,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Smazat"
@@ -843,6 +848,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1492,14 +1497,15 @@
 msgstr[2] "na {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Nastavení..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Otevřít globální nastaveni"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Předvolby"
@@ -1646,17 +1652,17 @@
 msgstr "Nápověda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Zpráva o stavu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Zkopírovat do schránky a zavřít"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1801,34 +1807,34 @@
 msgstr "Tento uzel není přilepen k ničemu jinému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Žádný z těchto uzlů není připojen na něco jiného."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Žádný z uzlů v této cestě není připojen na něco jiného."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tento výběr nelze použít pro oddělení uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Jeden otagovaný uzel, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden uzel používaný více než jednou cestou, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1837,5 +1843,5 @@
 "nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1844,5 +1850,5 @@
 "cestě."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1855,9 +1861,9 @@
 "své vlastní kopie a všechny uzly budou vybrány."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nespojený uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1865,5 +1871,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2030,4 +2036,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Zpět"
@@ -3256,24 +3264,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Předvolby uloženy na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nemohu nahrát předvolby. Důvod: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Nemohu nahrát předvolby ze serveru."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3282,5 +3290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3293,5 +3301,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3708,6 +3716,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3874,5 +3882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3887,10 +3895,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "silnice"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3898,15 +3906,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vodní tok"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3920,6 +3928,11 @@
 msgstr[2] "{0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Hromadná doprava"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3929,5 +3942,5 @@
 msgstr[2] "{0} prvků"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3969,9 +3982,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Připojení selhalo"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Připojení selhalo"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Neznámé jméno počítače"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Objekt smazán"
@@ -4077,65 +4100,65 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Nastavit jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/ADRESARI/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Změnit adresář pro všechna uživatelská nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4148,9 +4171,9 @@
 "využití ram"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4160,25 +4183,25 @@
 "selection nejprve nahrajte nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namísto --download=<bbox> můžete zadat osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktivuji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4191,5 +4214,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4198,5 +4221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4304,5 +4327,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Uživatel:"
@@ -4991,5 +5014,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5004,5 +5027,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5010,5 +5033,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5098,5 +5121,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "nic"
@@ -5279,5 +5302,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5289,5 +5312,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5382,5 +5405,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5389,5 +5412,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5470,13 +5493,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Přidat"
@@ -5607,54 +5630,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Nastavit aktuální výběr na seznam vybraných relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "Vybrat členy všech vybraných relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "Vybrat členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "Stáhnout všechny členy vybraných relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "Stáhnout členy"
@@ -6994,58 +7017,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7053,58 +7076,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7112,9 +7135,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7122,5 +7145,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7128,15 +7151,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7144,9 +7167,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7155,5 +7178,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7180,9 +7203,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Základní"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7192,5 +7216,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7201,5 +7225,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7241,22 +7265,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7265,10 +7291,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7277,10 +7303,10 @@
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7290,5 +7316,5 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7298,9 +7324,9 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
@@ -7328,61 +7354,57 @@
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Smazat {0} relaci"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Nevybrána žádná relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Zobrazovat ID objektů v seznamech"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Zobrazovat ID objektů v seznamech"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7439,5 +7461,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7452,12 +7474,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Nahrávám rodiče relace {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8085,6 +8107,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9168,6 +9191,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9255,9 +9278,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9279,4 +9301,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9737,24 +9766,24 @@
 msgstr[2] "{0} bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Soubory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Soubor {0} je načten pod jménem \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba při parsování {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemůžu číst \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9766,34 +9795,34 @@
 "pásmo<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Čas GPS (načten z předchozích fotografií): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/rrrr hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Jsem v časovém pásmu: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Žádné datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Otevřít další fotografie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronizovat čas z fotografie GPS přijímače"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9803,114 +9832,116 @@
 "Prosíme, použijte požadvaný formát"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Neplatné datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Není nahraná GPX trasa>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX trasa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Otevřít jinou GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Auto-odhad"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Posun:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Korelovat obrázky s GPX trasou"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Korelovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Nepatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Neplatný posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časová zóna: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuty: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekundy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9918,38 +9949,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Zvolené fotografie neobsahují informace o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Fotografie neobsahují informace o čase"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX trasa neobsahuje časové údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Měli byste vybrat GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Není vybrána GPX trasa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9960,5 +9991,5 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9969,56 +10000,56 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrahovat pozice GPS z EXIFu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Začínam prohledávat adresář"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Načíst fotografie..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čtu {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemohu najít výchozí cesto pro adresář {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prohledávám adresář {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nalezen nulový soubor v adresáři {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba při získávání souborů z adresáře {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10027,22 +10058,22 @@
 msgstr[2] "obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "Bylo nalezeno {0} fotografií s GPS tagem."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10233,4 +10264,583 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Použít globální nastavení."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autoři"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Plavební kanál"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Jméno uživatele"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Heslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Otočit vpravo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Přidat vlastnosti"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autoři"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Zadejte uživatelské jméno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Zadejte uživatelské jméno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Selhala inicializace API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Přístup"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Pokročilé volby"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Zadejte uživatelské jméno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Zadejte uživatelské jméno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Klikněte pro zrušení aktuální operace"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Zvolte minimálně jeden uzel nebo cestu"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Nebyly nalezeny záznamy pro \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Zavřít dialog a ukončit stahování"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Klikněte pro uzavření dialogu a zrušení mazání objektů"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Stahuji balík uzlů z ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Chybějící povinný atribut ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Nahrát nastavení"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Vyžádat aktualizaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Kliněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
+"položek</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurace"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Klikněnte pro odstranění cíle"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Místo pro kontaktování záchranářů"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Klikněnte pro odstranění cíle"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Přístup"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Aktualizace selhala"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "řetězec;řetězec;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10262,5 +10872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10268,5 +10878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10274,7 +10884,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Zvolte řádek k vymazání"
@@ -10717,12 +11327,4 @@
 msgstr "OSM data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Zanechávat záložní soubory"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Při ukládání zanechávat záložní soubory končící znakem ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10761,17 +11363,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Vzhled a chování"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr "Vyhledávám dostupné překlady ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Výchozí (automaticky)"
@@ -10838,10 +11435,19 @@
 msgstr "Nastavení webů s pluginy"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Zrušit změny a zavřít dialog"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Nastavení zobrazení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10849,29 +11455,29 @@
 msgstr "Různá nastavení ovlivňující vzhled celého programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Nastavení připojení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavení připojení pro OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Nastavení mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Nastavení projekce mapy a interpretace dat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Nastavení zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Nastavení pro přehrávání zvuků a zvukové značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Některá nastavení se projeví až po restartování JOSM."
@@ -10898,91 +11504,29 @@
 msgstr "Projekce {0} nemohla být aktivována. Používam Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Atrakce"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Nastavení proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Základní URL OSM serveru (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL serveru"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "Uživatelské jméno (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM heslo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru."
-"<br>Heslo je jako text přenášeno na server a je součástí URL."
-"<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11259,4 +11803,256 @@
 msgstr "Skupiny modifikátorů"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Neplatné URL?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>Prosím "
+"prověřte funkčnost internetového připojení.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Spojení selhalo."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Použít výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Zanechávat záložní soubory"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Při ukládání zanechávat záložní soubory končící znakem ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM uživatelské jméno (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM heslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru."
+"<br>Heslo je jako text přenášeno na server a je součástí URL."
+"<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Předvolby"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL serveru"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Ověřit"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Nynějsí hodnota je výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Prosím restartujte JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11402,5 +12198,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11452,23 +12248,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11477,16 +12279,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11494,5 +12296,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11500,5 +12302,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11737,5 +12539,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11780,5 +12582,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11826,30 +12628,30 @@
 msgstr "OK - další pokus."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Zahajuji pokus {0} z {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "Aktuální sada změn je prázdná. Nelze nahrávat data na server."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Očekávána otevřená sada změn. Nalezena uzavřená sada změn s id {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Kód={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12014,4 +12816,19 @@
 msgstr "Načítám seznam sad změn..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12315,24 +13132,29 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "Chybí XML tag <user>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Chybějící atribut ''{0}'' na XML tagu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 "Neplatná hodnota pro atribut ''{0}'' na XML tagu ''{1}''. Nalezeno {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Načítám sadu změn {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12723,5 +13545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12730,5 +13552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12738,5 +13560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12749,5 +13571,30 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12758,5 +13605,5 @@
 "uzavřená.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12767,5 +13614,5 @@
 "uzavřená od {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12774,9 +13621,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12785,5 +13632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12793,5 +13640,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12802,5 +13649,5 @@
 "prověřte funkčnost internetového připojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12811,5 +13658,5 @@
 "problémům s přenosem dat.<br>Detaily(nepřeloženo): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12818,10 +13665,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12830,10 +13677,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12844,5 +13691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12855,5 +13702,5 @@
 "vaše internetové připojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12864,18 +13711,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12902,4 +13736,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13286,5 +14126,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Vybrat Feuille"
@@ -13335,5 +14175,11 @@
 msgstr "CadastreGrabber: Neplatné URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13344,25 +14190,23 @@
 "nebo byla akce přerušena"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Vyberte z..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Vybrat commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Vyberte z..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13375,13 +14219,13 @@
 "Chcete používat F11 pro grabování pluginem?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13389,34 +14233,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Nahradit původní pozadí pozadím nastaveným v JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Obrácené stupně šedi (pro černá pozadí)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Nastavit průhledné pozadí."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Zobrazovat hranice stažených dat."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Zapnout automatické cachování."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Max. velikost cache (v MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13428,19 +14272,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS francouzského katastru"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 "<html>Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13449,5 +14293,5 @@
 "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13457,45 +14301,45 @@
 "texty na tmavém pozadí."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Povolit skládání více vrstev"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Zobrazovat rámeček kolem dat stažených z WMS serveru."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Fixní velikost čtverce (výchozí je 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Fixní velikost (od 25 do 1000 metrů)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13609,5 +14453,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13617,14 +14461,14 @@
 "(jsou potřeba dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "Ořezávání obrázků"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr "Klikněte na druhý roh pro oříznutí obrázku"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13632,14 +14476,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13649,21 +14493,21 @@
 "nebo jen opakovat "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Sever"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13776,28 +14620,28 @@
 msgstr "Prázdná vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), nahráno {1} dlaždic"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Není vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Velikost rastru: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Je vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13808,9 +14652,9 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -13818,38 +14662,38 @@
 "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Použití"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Vyberte schéma k použití."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Schéma barev"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Vyberte schéma ke smazání."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Použít vybrané schéma ze seznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Použít současné bervy jako nové barevné schéma."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Smazat vybrané schéma ze seznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Schémata barev"
@@ -14013,6 +14857,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Obnovit"
@@ -14242,33 +15086,33 @@
 msgstr "Došlo k neznámé chybě"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "východ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "severovýchod"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "sever"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "severozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "západ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "jihozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "jih"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "jihovýchod"
@@ -14308,5 +15152,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14317,80 +15161,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "voda"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "pobřeží"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "země"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maximální počet úseků na cestu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximální počet uzlů v prvotním trasování"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximální hodnota šedé braná jako voda (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Přesnost zjednodušování čar (stupňů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Rozlišení dlaždic Landsat (pixelů na stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Velikost dlaždic Landsat (pixelů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Posunout všechny trasy na východ (stupňů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Posunout všechny trasy na sever (stupňů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Směr hledání země"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Tagovat cesty jako"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS vrstva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maximální velikost cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maximální stáří cache (dnů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Zdrojový text"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14398,5 +15242,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14406,5 +15250,5 @@
 "Může být v rozmezí 0-255. Výchozí hodnota 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14415,5 +15259,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14422,21 +15266,21 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Posun všech bodů východním směrem (stupňů). Výchozí hodnota 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Posun všech bodů severním směrem (stupňů). Výchozí hodnota 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Směr hledání země. Standardně východ."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14444,9 +15288,9 @@
 "je water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Která WMS vrstva má být vybrána k trasování ? Výchozí: IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
@@ -14454,18 +15298,18 @@
 "je 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximální stáří jednotlivých souborů v cache ve dnech. Výchozí hodnota je 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Text odkazující na použitý zdroj. Implicitně Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Plugin pro trasování vodních ploch z fotografií Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Nastavení  pluginu Lakewalker"
@@ -14675,5 +15519,5 @@
 msgstr "Stahovací smyčka OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -14703,5 +15547,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14717,14 +15560,22 @@
 "Hlavička obsahuje několik hodnot a nelze ji mapovat do jednoduchého řetězce"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Otevřít OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14734,22 +15585,31 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Přidat komentář"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Zadejte váš komentář"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "veřejná zeleň (mimo parky)"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Označit jako hotové"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Opravdu uzavřít?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14759,23 +15619,51 @@
 "volitelný komentář:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Zavřít"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nový problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Vytvořit problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Podrobně popište problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Vytvořeno v:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Zadejte uživatelské jméno"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Neznámý stav problému"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Otevřít OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14797,10 +15685,10 @@
 msgstr "Neznámá koncovka souboru: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14810,5 +15698,5 @@
 "mapy v nastavení."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Spustitelný soubor Firefoxu"
@@ -14818,37 +15706,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "nahrání dat z API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "vytváření nových objektů"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "změna výběru"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "změna pohledu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrzovat ručně všechny akce Dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňující ovládání JOSM z jiných aplikací."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Dálkové ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavení pro plugin \"Remote Control\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14860,5 +15748,5 @@
 "využívající tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Povolené akce"
@@ -14972,25 +15860,25 @@
 msgstr "Vymazat cestu"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Nastavení pluginu routing"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Nastavení předvoleb směrování"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Typ silnice"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Rychlost (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Váha"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Zadejte jednotky váhy"
@@ -15036,42 +15924,42 @@
 msgstr "obrázek "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "automatické přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "automaticky stahovat dlaždice"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Nastavení pro plugin SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Zdroj dlaždic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Automatické přiblížení: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Automaticky stahovat dlaždice: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max. úroveň přiblížení: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Ztlumit pozadí: "
@@ -15307,37 +16195,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Používat seznam výjimek."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Používat seznam výjimek pro potlačení varování."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Použít vrstvu s chybami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Použít vrstvu s chybami pro zobrazení problematických elementů."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Zobrazovat informační zprávy při nahrávání."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Zobrazovat informační testy v oknech kontroly nahrávání."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Na požádání"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Při nahrávání"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15345,5 +16233,5 @@
 msgstr "Kontrolor OSM dat, hledající běžné chyby udělané uživateli a programy."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Kontrola dat"
@@ -15953,5 +16841,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "budova"
@@ -15965,5 +16853,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "oblast"
@@ -16358,55 +17246,55 @@
 msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Nastavení pluginu WMS Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Upravit seznam WMS serverů zobrazený v menu WMS pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Jméno v menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Jméno v menu (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadejte jméno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Kopírovat zvolené výchozí hodnoty"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Vyberte alespoň jeden řádek pro kopírování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Stahovač:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Překryv dlaždic"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "% na východ:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "% na sever:"
@@ -16774,10 +17662,10 @@
 #: build/trans_presets.java:68
 msgid "Highways"
-msgstr "Silnice"
+msgstr "Silniční síť"
 
 #. group "Highways"
 #: build/trans_presets.java:69
 msgid "Streets"
-msgstr "Ulice"
+msgstr "Uliční a silniční síť"
 
 #. group "Highways/Streets"
@@ -17222,5 +18110,5 @@
 #: build/trans_presets.java:221 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr "Místní silnice"
+msgstr "Silnice bez zařazení (mimo obec)"
 
 #. item "Highways/Streets/Unclassified"
@@ -17279,5 +18167,5 @@
 #: build/trans_presets.java:240 build/trans_surveyor.java:88
 msgid "Residential"
-msgstr "Ulice"
+msgstr "Místní komunikace (ulice)"
 
 #. item "Highways/Streets/Residential"
@@ -17286,5 +18174,5 @@
 #: build/trans_presets.java:243
 msgid "Edit Residential Street"
-msgstr "Upravit ulici"
+msgstr "Upravit místní komunikaci (ulici)"
 
 #. item "Highways/Streets/Residential" combo "Layer"
@@ -17593,5 +18481,5 @@
 #: build/trans_presets.java:334
 msgid "No exit (cul-de-sac)"
-msgstr "Slepá ulice"
+msgstr "Slepá komunikace"
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
@@ -17976,6 +18864,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "dálnice"
@@ -18001,6 +18889,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "čtyřproudá silnice"
@@ -18026,6 +18914,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "silnice první třídy"
@@ -18051,6 +18939,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "silnice druhé třídy"
@@ -18064,5 +18952,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "silnice třetí třídy"
@@ -18080,5 +18968,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "obytná oblast"
@@ -18112,6 +19000,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "obslužná cesta"
@@ -18145,6 +19033,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "konstrukce"
@@ -18173,5 +19061,5 @@
 #: build/trans_presets.java:406
 msgid "Construction"
-msgstr "Výstavba, plánovaná výstavba (Construction)"
+msgstr "Komunikace ve výstavbě"
 
 #. item "Ways/Construction"
@@ -18194,5 +19082,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -18203,5 +19091,5 @@
 #: build/trans_presets.java:429
 msgid "Bridleway"
-msgstr "Cesta pro koně"
+msgstr "Hypostezka, stezka pro koně"
 
 #. item "Ways/Bridleway"
@@ -18234,5 +19122,5 @@
 #: build/trans_presets.java:468
 msgid "Footway"
-msgstr "Chodník, stezka"
+msgstr "Chodník, stezka pro chodce"
 
 #. item "Ways/Footway"
@@ -18359,5 +19247,5 @@
 #: build/trans_presets.java:653
 msgid "Path"
-msgstr "Cesta vychozená v terénu pro cyklo/pěší (path)"
+msgstr "Pěšina, vychozená cesta pro pěší/cyklo (path)"
 
 #. item "Ways/Path"
@@ -18686,10 +19574,10 @@
 #: build/trans_presets.java:818
 msgid "City Limit"
-msgstr "Hranice města/obce"
+msgstr "Značka hranice sídla (rychlostní limit)"
 
 #. item "Waypoints/City Limit"
 #: build/trans_presets.java:819
 msgid "Edit City Limit Sign"
-msgstr "Upravit značku hranice města/obce"
+msgstr "Upravit značka hranice sídla (rychlostní limit)"
 
 #. item "Waypoints/City Limit" text "Name"
@@ -19001,10 +19889,10 @@
 #: build/trans_presets.java:1034
 msgid "Turnstile"
-msgstr ""
+msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
 #: build/trans_presets.java:1035
 msgid "Edit Turnstile"
-msgstr ""
+msgstr "Upravit turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
@@ -19026,5 +19914,5 @@
 #: build/trans_presets.java:1102
 msgid "Water"
-msgstr "Vodní plocha"
+msgstr "Vodstvo"
 
 #. group "Water/Water"
@@ -19116,5 +20004,5 @@
 #: build/trans_presets.java:1120
 msgid "Reservoir"
-msgstr "Umělá vodní plocha"
+msgstr "Umělá vodní nádrž"
 
 #. item "Water/Water/Reservoir"
@@ -19127,5 +20015,5 @@
 #: build/trans_presets.java:1127
 msgid "Covered Reservoir"
-msgstr "Zakrytá umělá vodní plocha"
+msgstr "Krytá vodní nádrž"
 
 #. item "Water/Water/Covered Reservoir"
@@ -19178,5 +20066,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "mokřina"
@@ -19386,5 +20274,5 @@
 #: build/trans_presets.java:1261
 msgid "Transport"
-msgstr ""
+msgstr "Doprava"
 
 #. group "Transport"
@@ -19543,5 +20431,5 @@
 #: build/trans_presets.java:1332
 msgid "Abandoned Rail"
-msgstr "Opuštěná železnice"
+msgstr "snesená železnice (pouze žel. spodek)"
 
 #. item "Transport/Railway/Abandoned Rail"
@@ -19992,5 +20880,5 @@
 #: build/trans_presets.java:1436
 msgid "Sharing"
-msgstr "Sdílení"
+msgstr "Sdílené vlastnictví vozidel"
 
 #. item "Car/Sharing"
@@ -19998,5 +20886,5 @@
 #: build/trans_presets.java:1438
 msgid "Edit Car Sharing"
-msgstr "̈́Upravit sdílení aut"
+msgstr "̈́Upravit sdílené vlastnictví vozidel"
 
 #. item "Bicycle/Parking"
@@ -20027,5 +20915,5 @@
 msgctxt "railway"
 msgid "Station"
-msgstr "Stanice"
+msgstr "Vlaková stanice"
 
 #. item "Public Transport/Station"
@@ -20046,5 +20934,5 @@
 #: build/trans_presets.java:1472
 msgid "Railway Halt"
-msgstr "Železniční zastávka"
+msgstr "Vlaková zastávka"
 
 #. item "Public Transport/Railway Halt"
@@ -20071,5 +20959,5 @@
 #: build/trans_presets.java:1491
 msgid "Railway Platform"
-msgstr "Železniční nástupiště"
+msgstr "Kolejové nástupiště (tram/vlak)"
 
 #. item "Public Transport/Railway Platform"
@@ -20078,5 +20966,5 @@
 #: build/trans_presets.java:1494
 msgid "Edit Railway Platform"
-msgstr "Upravit železniční nástupiště"
+msgstr "Upravit kolejové nástupiště (tram/vlak)"
 
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
@@ -20575,7 +21463,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "ulice"
@@ -20786,5 +21674,5 @@
 #: build/trans_presets.java:1830
 msgid "Palaeontological Site"
-msgstr "Paleontologický areál"
+msgstr "Paleontologické naleziště"
 
 #. item "Historic Places/Palaeontological Site"
@@ -20792,5 +21680,5 @@
 #: build/trans_presets.java:1832
 msgid "Edit Palaeontological Site"
-msgstr "Upravit paleontologický areál"
+msgstr "Upravit paleontologické naleziště"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -21303,28 +22191,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -22074,5 +22962,5 @@
 #: build/trans_presets.java:2147
 msgid "Man-Made"
-msgstr ""
+msgstr "Objekty a další POI"
 
 #. group "Man-Made"
@@ -22194,5 +23082,5 @@
 #: build/trans_presets.java:2212
 msgid "School"
-msgstr "Škola"
+msgstr "Základní škola"
 
 #. item "Man-Made/Buildings/School"
@@ -22510,5 +23398,5 @@
 #: build/trans_presets.java:2293
 msgid "Man Made"
-msgstr "Umělé konstrukce"
+msgstr "Inženýrské objekty"
 
 #. group "Man Made"
@@ -23019,4 +23907,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23051,9 +23947,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "zeleň"
@@ -23680,5 +24576,5 @@
 #: build/trans_presets.java:2791
 msgid "Geography"
-msgstr ""
+msgstr "Geografie"
 
 #. group "Geography"
@@ -24461,7 +25357,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "bicykl"
@@ -24531,7 +25427,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "pěší"
@@ -24557,5 +25453,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro"
@@ -24851,5 +25747,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "zastaralý"
@@ -24891,5 +25787,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "koňská"
@@ -24999,4 +25895,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25034,5 +25936,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25105,11 +26007,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "překážka"
@@ -25172,5 +26074,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -25226,7 +26128,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "dálnice"
@@ -25297,9 +26199,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "železnice"
@@ -25391,5 +26293,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "služby"
@@ -25403,5 +26305,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "brod"
@@ -25422,10 +26324,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25435,5 +26337,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25448,5 +26350,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "říční břeh"
@@ -25460,5 +26362,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "potok"
@@ -25472,5 +26374,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "dok"
@@ -25659,13 +26561,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25727,7 +26629,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25750,10 +26652,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25789,7 +26691,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25835,6 +26737,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25848,5 +26750,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminál"
@@ -25868,5 +26770,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25880,5 +26782,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25940,7 +26842,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "lanovka"
@@ -25957,5 +26859,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "lehká sjezdovka"
@@ -25970,5 +26872,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "střední sjezdovka"
@@ -25983,5 +26885,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "těžká sjezdovka"
@@ -25996,5 +26898,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "sjezdovka pro experty"
@@ -26009,5 +26911,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -26022,5 +26924,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "sjezdovka pro začátečníky"
@@ -26140,11 +27042,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "energetika"
@@ -26158,5 +27060,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "molo"
@@ -26170,5 +27072,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "potrubí"
@@ -26312,13 +27214,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -26332,5 +27234,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "přísav"
@@ -26426,10 +27328,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "občanská vybavenost"
@@ -26531,14 +27433,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26934,5 +27843,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26957,23 +27866,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -27005,6 +27914,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -27065,8 +27974,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "zdravotnictví"
@@ -27419,26 +28328,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "obchod"
@@ -27510,8 +28419,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27582,5 +28491,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27589,5 +28498,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27597,5 +28506,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27604,5 +28513,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27612,9 +28521,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turistika"
@@ -27702,14 +28611,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historické"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27718,5 +28626,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "lom"
@@ -27730,5 +28638,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "skládka"
@@ -27750,5 +28658,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "nádrže"
@@ -27762,5 +28670,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "les"
@@ -27774,5 +28682,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "zemědělství"
@@ -27795,5 +28703,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "obchody"
@@ -27807,5 +28715,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "průmysl"
@@ -27819,5 +28727,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -27831,5 +28739,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -27843,5 +28751,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "železniční plochy"
@@ -27898,7 +28806,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "vojenský"
@@ -27912,5 +28820,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "hřbitov"
@@ -27923,5 +28831,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "vrchol"
@@ -27936,5 +28844,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "ledovec"
@@ -27948,5 +28856,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "sopka"
@@ -28001,8 +28909,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "přírodní"
@@ -28016,5 +28924,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "křoví"
@@ -28028,5 +28936,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "vřesoviště"
@@ -28040,5 +28948,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "zalesněné území"
@@ -28052,5 +28960,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "bahno"
@@ -28064,5 +28972,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "pláž"
@@ -28140,8 +29048,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "cesta"
@@ -28164,4 +29072,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28189,7 +29138,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "hranice"
@@ -28339,11 +29293,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "místo"
@@ -28391,6 +29345,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adresa"
@@ -28684,10 +29638,10 @@
 #: build/trans_wms.java:27
 msgid "Czech CUZK:KM"
-msgstr "Český CUZK:KM"
+msgstr "český CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:28
 msgid "Czech UHUL:ORTOFOTO"
-msgstr "Český UHUL:ORTOFOTO"
+msgstr "český UHUL:ortofoto"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
@@ -28746,4 +29700,22 @@
 msgstr "Sicily - Itálie"
 
+#~ msgid "Looking up available translations..."
+#~ msgstr "Vyhledávám dostupné překlady ..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Základní URL OSM serveru (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo "
+#~ "ukládat."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "Uživatelské jméno (e-mail)"
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -28912,7 +29884,4 @@
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyřešit konflikty"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uživatelské jméno (email)"
 
 #~ msgid "Incorrect password or username."
@@ -29144,7 +30113,4 @@
 #~ msgstr "<html>Mohu vyfotit můj GPS přijímač.<br>Může to pomoci?</html>"
 
-#~ msgid "Validate"
-#~ msgstr "Ověřit"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
@@ -29340,7 +30306,4 @@
 #~ msgid "error loading metadata"
 #~ msgstr "chyba při nahrávání metadat"
-
-#~ msgid "Request Update"
-#~ msgstr "Vyžádat aktualizaci"
 
 #~ msgid "Show Tile Status"
@@ -29565,7 +30528,4 @@
 #~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
 
-#~ msgid "Update failed"
-#~ msgstr "Aktualizace selhala"
-
 #~ msgid "Selection too big"
 #~ msgstr "Výběr je příliš velký"
@@ -29591,7 +30551,4 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Selhala inicializace API, prosím zkuste to znovu později."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Selhala inicializace API"
 
 #~ msgid ""
@@ -29889,4 +30846,7 @@
 #~ msgstr "Použít otevřenou sadu změn"
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Aktuální sada změn je prázdná. Nelze nahrávat data na server."
+
 #~ msgid "Error: failed to add authentication credentials to the connection."
 #~ msgstr "Chyba: nepodařilo se přidat přihlašovací udaje do připojení."
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 19246)
+++ applications/editors/josm/i18n/po/da.po	(revision 19319)
@@ -6,4 +6,5 @@
 # Michael Andersen <redkite@milvus.dk>, 2009.
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -12,6 +13,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2010-01-01 07:45+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-06 20:00+0000\n"
 "Last-Translator: Michael Andersen <Unknown>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -20,9 +21,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:21+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Skaber hovedgrænsefladen"
@@ -43,5 +44,5 @@
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorerer defekt URL: \"{0}\""
+msgstr "Ignorerer misformet URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:426
@@ -89,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -102,5 +103,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorerer defekt fil-URL: \"{0}\""
+msgstr "Ignorerer misformet fil-URL: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:458
@@ -111,5 +112,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr "<html>Kunne ikke læse filen \"{0}\".<br> Fejlen er: <br>{1}</html>"
+msgstr "<html>Kunne ikke læse filen ''{0}''<br> Fejlen er: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:459
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -277,4 +277,6 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Advarsel: uventet format af API base URL. Redirektion til info or historik "
+"side for OSM primitiv vil sandsynligvis fejle. API base URL er: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -284,4 +286,6 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Advarsel: uventet format af API base URL. Redirektion til bruger side for "
+"OSM bruger vil sandsynligvis fejle. API base URL er: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -296,4 +300,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Fortsæt"
@@ -324,5 +329,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -338,7 +343,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -385,5 +393,5 @@
 "</html>"
 msgstr ""
-"<html>Der er ingen lag, kildelaget<br>\"{0}\"<br>kunne flettes sammen med.</"
+"<html>Der er ingen lag, kildelaget<br>''{0}''br>kunne flettes sammen med.</"
 "html>"
 
@@ -472,6 +480,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -484,9 +493,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
 msgid "Close the dialog and create a new node"
-msgstr "Luk dialogen og skab et nyt punkt"
+msgstr "Luk dialogen og opret et nyt punkt"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
 msgid "Close the dialog, don't create a new node"
-msgstr "Luk dialogen uden at skabe et nyt punkt"
+msgstr "Luk dialogen uden at oprette et nyt punkt"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
@@ -550,5 +559,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -562,5 +571,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Information"
@@ -638,5 +647,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
 msgid "Toggle visibility of Changeset Manager window"
-msgstr "Skift synlighed af Rettesæt Manager vindue"
+msgstr "Slå synlighed af rettesætsmanager vindue til/fra"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
@@ -760,15 +769,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Slet"
@@ -846,6 +855,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -920,9 +929,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
 msgid "Toggle fullscreen view"
-msgstr "Slå fuldskærmsvisning til eller fra"
+msgstr "Slå fuldskærmsvisning til/fra"
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle Fullscreen view"
-msgstr "Slå fuldskærmsvisning til eller fra"
+msgstr "Slå fuldskærmsvisning til/fra"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -1020,5 +1029,5 @@
 #, java-format
 msgid "Parameter ''{0}'' must not be null."
-msgstr "parameteren \"{0}\" må ikke være en null-værdi"
+msgstr "parameteren ''{0}'' må ikke være en null-værdi"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
@@ -1243,5 +1252,5 @@
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
-"Kan ikke sammenlægge punkter: Ville være nødt til at slette vej \"{0}\" som "
+"Kan ikke sammenlægge punkter: Ville være nødt til at slette vej ''{0}''som "
 "stadig er i brug."
 
@@ -1358,5 +1367,5 @@
 #, java-format
 msgid "Opening file ''{0}'' ..."
-msgstr "Åbner fil \"{0}\" ..."
+msgstr "Åbner fil ''{0}'' ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
@@ -1499,14 +1508,15 @@
 msgstr[1] "til {0} primitiver"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Indstillinger..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Åbn en side for globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Indstillinger"
@@ -1651,17 +1661,17 @@
 msgstr "Hjælp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopier til udklipsholder og luk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1781,5 +1791,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
-msgstr ""
+msgstr "Slå GPX linjer til/fra"
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1790,5 +1800,5 @@
 #, java-format
 msgid "Toggles the global setting ''{0}''."
-msgstr "Skifter den globale indstilling \"{0}\"."
+msgstr "Slår den globale indstilling \"{0}\" til/fra."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
@@ -1805,33 +1815,33 @@
 msgstr "Dette punkt er ikke limet til noget andet."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen af disse punkter er limet til noget andet."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen af denne vejs punkter er limet til noget andet."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Det aktuelt valgte kan ikke bruges til ulimning."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vælg enten:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Et tagget punkt, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Et punkt, som bruges af mere end én vej, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Et punkt, som bruges af mere end én vej og en af disse veje, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1840,5 +1850,5 @@
 "eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1846,5 +1856,5 @@
 "* Én vej samt en eller flere af dens punkter, som bruges af mere end én vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1858,9 +1868,9 @@
 "egen kopi og alle punkter vil blive valgt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Ulimede punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1868,5 +1878,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2015,5 +2025,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
 msgid "Toggle Wireframe view"
-msgstr "Skift trådnet-visning"
+msgstr "Slå trådnet-visning til/fra"
 
 #. make numpad + behave like + (action is already registred)
@@ -2034,4 +2044,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Tilbage"
@@ -2387,7 +2399,7 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
-"Flyt objekter ved at trække i den; Shift for at tilføje til det valgte (Ctrl "
-"for at skifte); Shift-Ctrl for at rotere det valgte; eller skift mellem det "
-"valgte"
+"Flyt objekter ved at trække; Shift for at tilføje til det valgte (Ctrl for "
+"at slå til/fra); Shift-Ctrl for at rotere det valgte; eller skifte mellem "
+"det valgte"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2470,5 +2482,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=rute</b> - nøgle 'type' med værdi = præcist 'rute'."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
@@ -2477,4 +2489,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> - nøgle 'type' med hvilkensomhelst værdi. Prøv også "
+"<b>*=værdi</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
@@ -2484,5 +2498,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>fod:</b> - key=fod sat til hvilkensomhelst værdi."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
@@ -2494,4 +2508,5 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
+"<b>type:</b> - objektets type (<b>punkt</b>, <b>vej</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
@@ -2501,9 +2516,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
+msgstr "<b>bruger:anonym</b> - alle objekter ændret af anonyme brugere"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b>id:</b>... - objekt med givet ID (0 for nye objekter)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
@@ -2512,4 +2527,6 @@
 "assigned version)"
 msgstr ""
+"<b>version:</b>... - objekt med given version (0 objekter uden en tildelt "
+"version)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2518,4 +2535,6 @@
 "assigned changeset)"
 msgstr ""
+"<b>rettesæt:</b>... - objekt med givet rettesæt id (0 objekter uden tildelte "
+"rettesæt)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
@@ -2524,4 +2543,6 @@
 "min-max)"
 msgstr ""
+"<b>punkter:</b>... - objekt med givet antal punkter (punkter:tæl eller "
+"punkter:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
@@ -2530,4 +2551,5 @@
 "max)"
 msgstr ""
+"<b>tags:</b>... - objekt med givet antal tags (tags:tæl or tags:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
@@ -2536,4 +2558,6 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
+"<b>tidsstempel:</b>... -  objekter med dette tidsstempel (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> eller <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
@@ -2551,5 +2575,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
+msgstr "<b>utagget</b> - alle utaggede objekter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
@@ -2557,4 +2581,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
+"<b>barn <i>udtryk</i></b> - alle børn af objekter der matcher udtrykket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
@@ -2562,4 +2587,6 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
+"<b>forældr <i>udtryk</i></b> - alle forældre til objekter der matcher "
+"udtrykket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
@@ -2591,5 +2618,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 msgid "Submit filter"
-msgstr ""
+msgstr "Send filter"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
@@ -2615,5 +2642,5 @@
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
+msgstr "Intet fundet i markering ved søgning efter \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:289
@@ -2648,10 +2675,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:227
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
+msgstr "Nøgle kan ikke være tom når tag operatør bruges. Eksempel: nøgle=værdi"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:269
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
+msgstr "Mønster-syntaks-fejl: Mønster {0} i {1} er ulovlig!"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:415
@@ -2659,25 +2686,26 @@
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
+"Ukendt primitiv type: {0}. Tilladte værdier er punkt, vej eller relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:603
 #, java-format
 msgid "Unexpected token: {0}"
-msgstr ""
+msgstr "Uventet symbol: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 msgid "Missing parameter for OR"
-msgstr ""
+msgstr "Manglende parameter for OR"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:636
 msgid "Missing right parenthesis"
-msgstr ""
+msgstr "Manglende højre parantes"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:639
 msgid "Missing operator for NOT"
-msgstr ""
+msgstr "Manglende operatør for NOT"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:688
 msgid "Wrong number of parameters for tags operator."
-msgstr ""
+msgstr "Forkert antal parametre for tags operatør"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:690
@@ -2687,8 +2715,10 @@
 "or range, for example tags:1 or tags:2-5"
 msgstr ""
+"Ukorrekt værdi af tags operatør: {0}. Tags operatøren forventer antal af "
+"tags eller et interval, for eksempel tags:1 eller tags:2-5"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:700
 msgid "Wrong number of parameters for nodes operator."
-msgstr ""
+msgstr "Forkert antal parametre for punkt operatør."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
@@ -2698,4 +2728,6 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
+"Ukorrekt værdi af punkt operatør: {0}. Punkt operatøren forventer antal "
+"punkter eller et interval, for eksempel punkter:10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
@@ -2769,5 +2801,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
 msgid "Cycling dependencies"
-msgstr ""
+msgstr "Cykler afhængigheder"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2906,5 +2938,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
 msgid "Cannot resolve undecided conflict."
-msgstr ""
+msgstr "Kan ikke løse uafklaret konflikt"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57
@@ -3147,15 +3179,15 @@
 #, java-format
 msgid "Expected array of length 4, got {0}"
-msgstr ""
+msgstr "Forventede array med længde 4. Fik {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:63
 #, java-format
 msgid "Exactly four doubles excpected in string, got {0}"
-msgstr ""
+msgstr "Præcist fire doubles forventet i streng, har {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
 #, java-format
 msgid "Illegal double value ''{0}''"
-msgstr ""
+msgstr "Ulovlig double værdi {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:73
@@ -3164,10 +3196,10 @@
 #, java-format
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "Ulovlig breddegradsværdi \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
 #, java-format
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "Ulovlig længdegradsværdi ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
@@ -3175,10 +3207,10 @@
 #, java-format
 msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-msgstr ""
+msgstr "Parameter ''{0}'' > 0.0 forventet, fik {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Advarsel: Kunne ikke gemme indstillinger i \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
@@ -3193,4 +3225,6 @@
 "isn't a directory."
 msgstr ""
+"Advarsel: Kunne ikke initialisere indstillinger. Indstillingsbibliotek \"{0}"
+"\" er ikke et bibliotek."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
@@ -3200,4 +3234,6 @@
 "isn't a directory.</html>"
 msgstr ""
+"<html>Kunne ikke initialisere indstillinger.<br>Indstillingsbibliotek "
+"''{0}'' er ikke et bibliotek.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
@@ -3207,4 +3243,6 @@
 "preference directory: {0}"
 msgstr ""
+"Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke oprette "
+"manglende indstillingsbibliotek: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -3214,4 +3252,6 @@
 "preference directory: {0}</html>"
 msgstr ""
+"<html>Kunne ikke initialisere indstillinger.<br>Kunne ikke oprette manglende "
+"bibliotek: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
@@ -3220,4 +3260,6 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Advarsel: Manglende indstillingsfil \"{0}\". Opretter en standard-"
+"indstillingsfil."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3227,4 +3269,6 @@
 "file."
 msgstr ""
+"Advarsel: Erstatter eksisterende indstillingsfil \"{0}\" med standard-"
+"indstillingsfil."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3234,4 +3278,6 @@
 "to default: {0}</html>"
 msgstr ""
+"<html>Kunne ikke initialisere indstillinger.<br>Kunne ikke nulstille "
+"indstillingsfil til standard: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3241,4 +3287,6 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>Indstillingsfilen havde fejl.<br> Laver backup af den gamle til <br>{0}"
+"<br> og opretter en ny standard-indstillingsfil.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3248,9 +3296,11 @@
 "default: {0}"
 msgstr ""
+"Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke nulstille "
+"indstillingsfil til standard: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Fejl: Uventet linje ''{0}'' i bogmærkefil ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
@@ -3259,25 +3309,26 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+"Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkefil ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Indstillinger er gemt på {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kunne ikke sende indstillinger. Årsag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Kunne ikke hente indstillinger fra serveren."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+msgstr "Fejl: Uventet linje ''{0}'' i bogmærkeliste fra server"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3285,6 +3336,8 @@
 "server"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+"Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærke liste fra "
+"server"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3292,9 +3345,11 @@
 "{1}"
 msgstr ""
+"Kunne af sikkerhedsårsager ikke hente bogmærke fra \"{0}\". Undtagelse var: "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Kunne ikke indlæse ressource \"{0}\". Fejl er {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3307,14 +3362,14 @@
 msgid ""
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
+msgstr "Advarsel: Uventet JOSM versionsnummer i revisionsfil, værdi er \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Advarsel: revisionsfilen \"/REVISION\" mangler."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
-msgstr ""
+msgstr "Har allerede registreret en konflikt for primitiv \"{0}\"."
 
 #. *
@@ -3357,4 +3412,6 @@
 "Unable to add primitive {0} to the dataset because it's already included"
 msgstr ""
+"Er ikke i stand til at tilføje primitiv {0} til datasættet fordi den "
+"allerede er inkluderet"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
@@ -3365,4 +3422,7 @@
 "error, it should be safe to continue in your work."
 msgstr ""
+"JOSM forventede at finde primitiv [{0} {1}] i datasættet, men den er der "
+"ikke. Rapporter venligst dette på http://josm.openstreetmap.de . Dette er "
+"ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
@@ -3370,5 +3430,5 @@
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr ""
+msgstr "Manglende sammenlægningsmål for vej med id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162
@@ -3376,20 +3436,20 @@
 #, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "Manglende sammenlægningsmål for punkt med id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
 #, java-format
 msgid "Missing merge target for object with id {0}"
-msgstr ""
+msgstr "Manglende sammenlægningsmål for objekt med id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241
 #, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "Manglende sammenlægningsmål for relation med id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Manglende sammenlægningsmål af type {0} med id {1}"
 
 #. should not happen
@@ -3402,4 +3462,7 @@
 "Keeping target object. "
 msgstr ""
+"Målobjekt med id {0} og version {1} er synlig selvom kildeobjekt med lavere "
+"version {2} ikke er synlig. Kan ikke håndtere denne inkonsistens. Beholder "
+"målobjekt. "
 
 #. translators notes must be in front
@@ -3418,5 +3481,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #. column header: apply filter for children
@@ -3459,24 +3522,24 @@
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
-msgstr ""
+msgstr "Forventet ID >= 0. Fik {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:401
 msgid "A primitive with ID = 0 can't be invisible."
-msgstr ""
+msgstr "En primitiv med ID = 0 kan ikke være usynlig."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
 #, java-format
 msgid "ID > 0 expected. Got {0}."
-msgstr ""
+msgstr "ID > 0 forventet. Fik {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
 #, java-format
 msgid "Version > 0 expected. Got {0}."
-msgstr ""
+msgstr "Version > 0 forventet. Fik {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:652
 #, java-format
 msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr ""
+msgstr "Parameter \"{0}\" >= 0 forventet. Fik {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
@@ -3486,4 +3549,6 @@
 "{0}"
 msgstr ""
+"Kan ikke tildele et rettesætsID > 0 til en ny primitiv. Værdi af rettesætsID "
+"er {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
@@ -3492,4 +3557,6 @@
 "other is not"
 msgstr ""
+"Kan ikke sammenlægge fordi en af de involverede primitiver er ny og den "
+"anden ikke er det."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1042
@@ -3498,4 +3565,6 @@
 "Can''t merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
+"Kan ikke sammenlægge primitiver med forskellige IDs. Denne ID er {0}, mens "
+"den anden er {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:37
@@ -3518,4 +3587,6 @@
 "multiple values."
 msgstr ""
+"Tag-samlingen kan ikke bruges med en primitiv fordi der er nøgler med flere "
+"værdier."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
@@ -3523,5 +3594,5 @@
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
+msgstr "Kan ikke føje punkt {0} til ukomplet vej {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
@@ -3531,5 +3602,5 @@
 #, java-format
 msgid "Parameter ''{0}'' > 0 expected, got {1}"
-msgstr ""
+msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
@@ -3550,4 +3621,5 @@
 msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
+"Kan ikke sammenligne primitiv med ID \"{0}\" med primitiv med ID \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -3555,5 +3627,5 @@
 #, java-format
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr ""
+msgstr "Parameter {0} ikke i interval 0..{1}. Fik ''{2}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:187
@@ -3633,5 +3705,5 @@
 #, java-format
 msgid "Style for restriction {0} not found."
-msgstr ""
+msgstr "Stil for restriktion {0} ikke fundet."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:643
@@ -3663,10 +3735,10 @@
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr ""
+msgstr "Stil for indre vej \"{0}\" er lig med multipolygon."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:837
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
-msgstr ""
+msgstr "Stil for ydre vej \"{0}\" passer ikke sammen."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1035
@@ -3707,6 +3779,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3748,13 +3820,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25
 msgid "areatext"
-msgstr ""
+msgstr "Områdetekst"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
 msgid "WGS84 Geographic"
-msgstr ""
+msgstr "WGS84 Geografisk"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:220
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:100
@@ -3764,8 +3836,10 @@
 "NTF<->RGF93 grid"
 msgstr ""
+"Advarsel: Kunne ikke åbne input strøm for resource ''/data/{0}''. Kan ikke "
+"hente NTF<->RGF93 net."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
 msgid "Lambert 4 Zones (France)"
-msgstr ""
+msgstr "Lambert 4 Zones (France)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:249
@@ -3783,19 +3857,19 @@
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
-msgstr ""
+msgstr "{0} ({1} til {2} grader)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
 #, java-format
 msgid "{0} (Corsica)"
-msgstr ""
+msgstr "{0} (Corsica)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
 msgid "Lambert CC Zone"
-msgstr ""
+msgstr "Lambert CC Zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
 msgid "Lambert CC9 Zone (France)"
-msgstr ""
+msgstr "Lambert CC9 Zone (France)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3809,68 +3883,68 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
-msgstr ""
+msgstr "PUWG (Poland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
 msgid "PUWG Zone"
-msgstr ""
+msgstr "PUWG Zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
 msgid "PUWG 1992 (Poland)"
-msgstr ""
+msgstr "PUWG 1992 (Poland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr ""
+msgstr "PUWG 2000 Zone {0} (Poland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
 msgid "Swiss Grid (Switzerland)"
-msgstr ""
+msgstr "Swiss Grid (Switzerland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351
 msgid "UTM"
-msgstr ""
+msgstr "UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:392
 msgid "UTM Zone"
-msgstr ""
+msgstr "UTM Zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26
 msgid "Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27
 msgid "Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386
 msgid "UTM 20N (France)"
-msgstr ""
+msgstr "UTM 20N (Frankrig)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398
 msgid "UTM20 North Geodesic system"
-msgstr ""
+msgstr "UTM20 North Geodesic system"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
+msgstr "<html>Kunne ikke læse bogmærker fra<br>''{0}''<br>Fejl var: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Kunne ikke skrive bogmærke.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:199
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
+msgstr "Vis ikke igen (husker valg)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3885,10 +3959,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "landevej"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3896,15 +3970,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vandvej"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "brug af jord"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3917,6 +3991,11 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Offentlig transport"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3925,37 +4004,37 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
-msgstr ""
+msgstr "Rettesæt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
-msgstr ""
+msgstr "Brud på forudsætninger"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
-msgstr ""
+msgstr "Sikkerhedsundtagelse"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
-msgstr ""
+msgstr "Netværksundtagelse"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
-msgstr ""
+msgstr "IO undtagelse."
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
-msgstr ""
+msgstr "Intern server fejl"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
-msgstr ""
+msgstr "Ugyldig forespørgsel"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
-msgstr ""
+msgstr "Ikke fundet"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
@@ -3965,11 +4044,21 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Godkend"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Forbindelsen mislykkedes"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Ukendt vært"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
-msgstr ""
+msgstr "Objekt slettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
@@ -3978,5 +4067,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
-msgstr ""
+msgstr "Vis hjælpe information"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3990,5 +4079,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 msgid "Click to close the dialog"
-msgstr ""
+msgstr "Klik for at lukke dialogen"
 
 #: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:84
@@ -3996,5 +4085,5 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr ""
+msgstr "Forventede ikke-tom værdi for parameter \"{0}\". Fik \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4019,5 +4108,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "OSM Password."
-msgstr "OSM-kodeord"
+msgstr "OSM-adgangskode"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -4072,67 +4161,67 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
-msgstr "Kodeord"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+msgstr "Adgangskode"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+msgstr "Standard unix geometrisk argument"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Hent det omsluttende område"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hent lokaliteten fra URL'en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Åbn fil (som rå GPS, hvis .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Hent det omsluttende område som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+msgstr "Vælg med den givne søgning"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Start op i maksimeret tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Vælg sprog."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgstr "options givet som Java systemegenskaber"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgstr "/STI/TIL/JOSM/FOLDER/         "
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgstr "Ændr folderen for alle bruger indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4140,39 +4229,44 @@
 "      Java option to increase the maximum size of allocated memory"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+"Bemærk: For nogle opgave behøver JOSM en masse hukommelse. Det kan være "
+"nødvendigt at tilføje den følgende\n"
+"      Java option for at øge den tildelte hukommelses maksimumstørrelse."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
 "some data before --selection"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+"Parametre læses i den orden de specificeres, så vær sikker på at du loader\n"
+"nogle data før --selection"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "I stedet for --download=<bbox> kan du angive osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktiverer opdaterede udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
+msgstr "Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
@@ -4182,5 +4276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4189,5 +4283,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4207,5 +4301,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
-msgstr "Forudindstillinger"
+msgstr "Fordefinerede"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:193
@@ -4289,4 +4383,6 @@
 "this list with the mouse.<hr>"
 msgstr ""
+"Midter-klik for at cykle gennem.<br>Hold CTRL for at vælge direkte fra denne "
+"liste med musen.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
@@ -4295,7 +4391,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
-msgstr ""
+msgstr "Bruger:"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:371
@@ -4307,9 +4403,9 @@
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
-msgstr ""
+msgstr "Lag \"{0}\" skal være i laglisten"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
 msgid "Click to cancel the current operation"
-msgstr ""
+msgstr "Klik for at afbryde den aktuelle operation"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4341,4 +4437,6 @@
 "relation</strong>.</html>"
 msgstr ""
+"<html>Bekræft venligst for at fjerne <strong>1 objekt</strong> fra <strong>1 "
+"relation</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4349,4 +4447,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Bekræft venligst for at fjerne <strong>1 objekt</strong> fra <strong>"
+"{0} relationer</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4356,4 +4456,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Bekræft venligst for at fjerne <strong>{0} objekter</strong> fra "
+"<strong>{1} relationer</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
@@ -4361,23 +4463,23 @@
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sletter {0} objekt"
+msgstr[1] "Sletter {0} objekter"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
 msgid "Delete objects"
-msgstr ""
+msgstr "Sletter objekter"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
 msgid "To delete"
-msgstr ""
+msgstr "At slette"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
 msgid "From Relation"
-msgstr ""
+msgstr "Fra relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "Pos."
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336
@@ -4392,9 +4494,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352
 msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "Klik for at lukke dialogen og fjerne objektet fra relationerne"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Klik for at lukke dialogen og afbryde sletning af objekterne"
 
 #. *
@@ -4403,5 +4505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
-msgstr ""
+msgstr "Min med deres"
 
 #. *
@@ -4422,5 +4524,5 @@
 #, java-format
 msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
+msgstr "Rolle {0} er ikke involveret i sammenligningspar {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
@@ -4455,5 +4557,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Ingen uafklarede tagkonflikter der skal løses"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
@@ -4465,5 +4567,5 @@
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
+msgstr "{0} uafklarede tagkonflikter der skal løses"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
@@ -4475,4 +4577,6 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
+"Sammenlagt punktliste frosset. Ingen uafklarede konflikter i denne vejs "
+"punktliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
@@ -4482,5 +4586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
-msgstr ""
+msgstr "Uafklarede konflikter i denne vejs punktliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
@@ -4493,4 +4597,6 @@
 "relation"
 msgstr ""
+"Sammenlagt medlemsliste frosset. Ingen uafklarede konflikter i denne "
+"relations medlemsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
@@ -4500,9 +4606,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
-msgstr ""
+msgstr "Uafklarede konflikter i denne relations medlemsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
-msgstr ""
+msgstr "Ingen uafklarede egenskabskonflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
@@ -4512,9 +4618,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
-msgstr ""
+msgstr "uafklarede egenskabskonflikter der skal løses"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Konflikt-løsning"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322
@@ -4522,5 +4628,5 @@
 #, java-format
 msgid "Parameter current out of range. Got {0}."
-msgstr ""
+msgstr "Parameter ude af intervalområde. Fik {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586
@@ -4528,19 +4634,19 @@
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
-msgstr ""
+msgstr "Liste i rolle {0} deltager ikke i et sammenligningspar."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr ""
+msgstr "Uventet værdi af parameter \"indeks\". Fik {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773
 #, java-format
 msgid "Item {0} not found in list."
-msgstr ""
+msgstr "Emne {0} ikke fundet på liste."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217
 msgid "lock scrolling"
-msgstr ""
+msgstr "Lås rulning"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225
@@ -4555,5 +4661,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Liste af elementer i mit datasæt, f.eks. det lokale datasæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266
@@ -4568,4 +4674,6 @@
 "decisions are applied."
 msgstr ""
+"Liste af sammenlagte elementer. De vil erstate \"mine elementer\" når "
+"sammenlægningsbeslutningerne er udført."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272
@@ -4576,5 +4684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Liste af elementer i deres datasæt, f.eks. serverdatasættet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405
@@ -4585,4 +4693,5 @@
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
+"Kopiér mine markerede punkter til starten af den sammenlagte liste af punkter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432
@@ -4593,4 +4702,6 @@
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
+"Kopiér mine markerede elementer til enden af den sammenlagte liste af "
+"elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461
@@ -4599,4 +4710,6 @@
 "merged elements."
 msgstr ""
+"Kopiér mine markerede elementer ind før det første markerede element i "
+"listen af sammenlagte elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495
@@ -4605,4 +4718,6 @@
 "merged elements."
 msgstr ""
+"Kopiér mine markerede elementer ind efter det første markerede element i "
+"listen af sammenlagte elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524
@@ -4610,8 +4725,12 @@
 "Copy their selected element to the start of the list of merged elements."
 msgstr ""
+"Kopiér deres markerede element til starten af listen af sammenlagte "
+"elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546
 msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
+"Kopiér deres markerede elementer til enden af listen af sammenlagte "
+"elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568
@@ -4620,4 +4739,6 @@
 "of merged elements."
 msgstr ""
+"Kopiér deres markerede elementer ind før det første markerede element i "
+"listen af sammenlagte elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597
@@ -4626,4 +4747,6 @@
 "merged elements"
 msgstr ""
+"Kopiér deres markerede element ind efter det første markerede element i "
+"listen af sammenlagte elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624
@@ -4656,23 +4779,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690
 msgid "Remove the selected entries from the list of merged elements."
-msgstr ""
+msgstr "Fjern de markerede indlæg fra listen af sammenlagte elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756
 msgid "Freeze"
-msgstr ""
+msgstr "Frys"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
 msgid "Freeze the current list of merged elements."
-msgstr ""
+msgstr "Frys den nuværende liste af samlede elementer."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752
 msgid "Unfreeze"
-msgstr ""
+msgstr "Stands frysning"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
 msgid "Unfreeze the list of merged elements and start merging."
-msgstr ""
+msgstr "Stands frysning af listen af samlede elementer og start samling."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778
@@ -4682,4 +4805,6 @@
 "html>"
 msgstr ""
+"<html>Klik <strong>{0}</strong> for at begynde at sammenlægge mine og deres "
+"indlæg.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783
@@ -4689,4 +4814,6 @@
 "html>"
 msgstr ""
+"<html>Klik <strong>{0}</strong> for at afslutte sammenlægning af mine og "
+"deres indlæg.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801
@@ -4694,6 +4821,6 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Min version ({0} indlæg)"
+msgstr[1] "Min version ({0} indlæg)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
@@ -4701,6 +4828,6 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sammenlagt version ({0} indlæg)"
+msgstr[1] "Sammenlagt version ({0} indlæg)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
@@ -4708,6 +4835,6 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Deres version ({0} indlæg)"
+msgstr[1] "Deres version ({0} indlæg)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
@@ -4718,4 +4845,6 @@
 "adjustment."
 msgstr ""
+"Justerbar {0} ikke registreret endnu. Kan ikke sætte deltagelse i "
+"synkroniseret justering."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887
@@ -4723,5 +4852,5 @@
 #, java-format
 msgid "Adjustable {0} not registered yet."
-msgstr ""
+msgstr "Justerbar {0} ikke registreret endnu."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4732,4 +4861,5 @@
 msgid "Merged nodes not frozen yet. Can't build resolution command."
 msgstr ""
+"Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando."
 
 #. should not happen
@@ -4745,8 +4875,9 @@
 "html>"
 msgstr ""
+"<html>En fejl opstod under kommunikation med serveren<br>Detaljer: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423
 msgid "Communication with server failed"
-msgstr ""
+msgstr "Kommunikation med server fejlede"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465
@@ -4780,4 +4911,7 @@
 "</html>"
 msgstr ""
+"<html>Der er {0} flere primitiver som relation {1} refererer til<br>og som "
+"er slettet på serveren.<br><br>Ønsker du at omgøre sletningen af dem også?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
@@ -4787,5 +4921,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79
 msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Egenskaber i mit datasæt, f.eks. det lokale datasæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
@@ -4794,8 +4928,10 @@
 "elements when merge decisions are applied."
 msgstr ""
+"Egenskaber i det sammenlagte elementer. De vil erstatte egenskaber i mine "
+"elementer når sammenlægningsbeslutninger er udført."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Egenskaber i deres datasæt, f.eks. server datasættet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
@@ -4805,9 +4941,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
 msgid "Deleted State:"
-msgstr ""
+msgstr "Slettet status:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258
 msgid "Visible State:"
-msgstr ""
+msgstr "Synlig status:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338
@@ -4830,17 +4966,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
 msgid "visible (on the server)"
-msgstr ""
+msgstr "synlig (på server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "ikke synlig (på server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
 msgid "Keep a clone of the local version"
-msgstr ""
+msgstr "Behold en klon af den lokale version."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
 msgid "Physically delete from local dataset"
-msgstr ""
+msgstr "Slet fysisk fra lokal datasæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
@@ -4854,25 +4990,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501
 msgid "Undecide conflict between different coordinates"
-msgstr ""
+msgstr "Omgør beslutning om konflikt mellem forskellige koordinater"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516
 msgid "Keep my deleted state"
-msgstr ""
+msgstr "Behold min slettede status"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531
 msgid "Keep their deleted state"
-msgstr ""
+msgstr "Behold deres slettede status"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546
 msgid "Undecide conflict between deleted state"
-msgstr ""
+msgstr "Omgør beslutning om konflikt mellem slettede status"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561
 msgid "Keep my visible state"
-msgstr ""
+msgstr "Behold min slettede status"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576
 msgid "Yes, reset the id"
-msgstr ""
+msgstr "Ja, nulstil ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
@@ -4880,5 +5016,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
 msgid "No, abort"
-msgstr ""
+msgstr "Nej, afbryd"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581
@@ -4889,16 +5025,19 @@
 "yo agree?</html>"
 msgstr ""
+"<html>For at beholde din lokale version, er JOSM<br>nødt til at nulstille "
+"primitiv {0}'s ID til 0.<br>Ved næste upload vil serveren tildele<br>den en "
+"ny ID.<br>Indvilliger du?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Nulstil ID til 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602
 msgid "Keep their visible state"
-msgstr ""
+msgstr "Behold deres synlige status"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Ja, udrens det"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622
@@ -4908,12 +5047,14 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM vil være nødt til at fjerne din lokale primitiv med ID {0}<br>fra "
+"datasættet.<br>Indvilliger du?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
 msgid "Remove from dataset"
-msgstr ""
+msgstr "Fjern fra datasæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641
 msgid "Undecide conflict between visible state"
-msgstr ""
+msgstr "Omgør beslutning om konflikt mellem synlige status"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -4925,4 +5066,5 @@
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
+"Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
@@ -4943,5 +5085,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Det sammenlagte datasæt vil ikke indeholde en tag med nøgle {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
@@ -4949,10 +5091,10 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Mit datasæt indeholder ikke en tag med nøgle {0}"
 
 #. setting up the properties table
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4967,5 +5109,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4973,5 +5115,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4981,5 +5123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "Cannot apply undecided tag merge item."
-msgstr ""
+msgstr "Kan ikke anvende afgjort tagsammenlægningsgenstand."
 
 #. should not happen, but just in case
@@ -5004,17 +5146,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
 msgid "Keep the selected key/value pairs from the local dataset"
-msgstr ""
+msgstr "Behold de markerede nøgle/værdi par fra det lokale datasæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid "Keep the selected key/value pairs from the server dataset"
-msgstr ""
+msgstr "Behold de markerede nøgle/værdi par fra serverens datasæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378
 msgid "Undecide"
-msgstr ""
+msgstr "Marker som ubesluttet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Mark the selected tags as undecided"
-msgstr ""
+msgstr "Mærk de markerede tags som ubesluttede"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
@@ -5022,33 +5164,33 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Deres datasæt indeholder ikke en tag med nøgle {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Konflikter ved kombination af primitiver"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Konflikter ved kombination af primitiver - kombineret vej er \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:140
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
+msgstr "Konflikter ved sammenlægning af punkter - målpunkt er \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
 msgid "No conflicts to resolve"
-msgstr ""
+msgstr "Ingen konflikter at løse"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
-msgstr ""
+msgstr "Afbryd løsning af konflikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
-msgstr ""
+msgstr "Anvend løste konflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
@@ -5057,9 +5199,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
 msgid "Apply"
-msgstr ""
+msgstr "Anvend"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "intet"
@@ -5072,19 +5214,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66
 msgid "Choose a value"
-msgstr ""
+msgstr "Vælg en værdi"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Beslut venligst hvilke værdier der skal beholdes"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Værdi \"{0}\" vil blive anvendt for nøgle \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79
 #, java-format
 msgid "The key ''{0}'' and all its values are going to be removed"
-msgstr ""
+msgstr "Nøglen ''{0}'' og alle dens værdier vil blive fjernet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
@@ -5092,18 +5234,19 @@
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
 msgstr ""
+"Alle værdier slået sammen som ''{0}'' vil blive anvendt for nøgle ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
 msgid "Parameter ''{0}'' must not be empty."
-msgstr ""
+msgstr "Parameter ''{0}'' må ikke være tom."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
 #, java-format
 msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-msgstr ""
+msgstr "Parameter \"{0}\" med tags for præcist en nøgle forventet. Fik {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
 msgid "Tag collection doesn't include the selected value ''{0}''."
-msgstr ""
+msgstr "Tagsamling indeholder ikke den markerede værdi \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5112,36 +5255,36 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
 msgid "Not decided yet."
-msgstr ""
+msgstr "Beslut endnu ikke."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Tags fra punkter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Tags fra veje"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Tags fra relationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
+msgstr "Konflikter i indsatte tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
 msgid "Paste ..."
-msgstr ""
+msgstr "Indsæt ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
 msgid "From ..."
-msgstr ""
+msgstr "Fra ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
 msgid "To ..."
-msgstr ""
+msgstr "Til ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444
@@ -5149,6 +5292,6 @@
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} tag"
+msgstr[1] "{0} tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
@@ -5174,37 +5317,37 @@
 #, java-format
 msgid "Position {0} is out of range. Current number of members is {1}."
-msgstr ""
+msgstr "Position {0} er ude af rækkevidde. Nuværende antal medlemmer er {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 msgid "Remove this relation member from the relation"
-msgstr ""
+msgstr "Fjern dette relationsmedlem fra relationen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 msgid "Keep"
-msgstr ""
+msgstr "Behold"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
 msgid "Keep this relation member for the target object"
-msgstr ""
+msgstr "Behold dette relationsmedlem for målobjektet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
 msgid "Undecided"
-msgstr ""
+msgstr "Ikke besluttet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Not decided yet"
-msgstr ""
+msgstr "Ikke besluttet endnu"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
 msgid "Role:"
-msgstr ""
+msgstr "Rolle:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
 msgid "Enter a role for all relation memberships"
-msgstr ""
+msgstr "Indtast en rolle for alle relationsmedlemsskaber"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
 msgid "Tag modified relations with "
-msgstr ""
+msgstr "Tag modificerede relationer med "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5213,17 +5356,20 @@
 "modified relations.</html>"
 msgstr ""
+"<html>Markér for at gøre det muligt at indtaste en tag der vil blive "
+"anvendt<br>med alle modificerede relationer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
-msgstr ""
+msgstr "Nøgle:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
+"<html>Indtast en tag nøgle, f.eks. <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
-msgstr ""
+msgstr "Værdi:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
@@ -5231,4 +5377,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Indtast en tag værdi, f.eks. <strong><tt>Tjek medlemmer</tt></strong></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5239,6 +5387,13 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
-msgstr ""
+"place of the original way in the relation.</html>"
+msgstr ""
+"<html>De kombinerede veje er medlemmer i en eller flere relationer. Afgør "
+"venligst om du ønsker at <strong>beholde</strong> disse medlemsskaber for "
+"den kombinerede vej eller om du ønsker at <strong>fjerne</strong> dem."
+"<br>Standard er at <strong>beholde</strong> den første vej og "
+"<strong>fjerne</strong> de andre veje, der er medlemmer af den samme "
+"relation: den kombinerede vej vil erstatte den originale vej i relationen.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5249,30 +5404,38 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
-msgstr ""
+"the place of the original node in the relation.</html>"
+msgstr ""
+"<html>De sammenlagte punkter er medlemmer i en eller flere relationer. Afgør "
+"venligst om du ønsker at <strong>beholde</strong> disse medlemsskaber for "
+"den målpunktet eller om du ønsker at <strong>fjerne</strong> dem."
+"<br>Standard er at <strong>beholde</strong> det første punkt og "
+"<strong>fjerne</strong> de andre punkter, der er medlemmer af den samme "
+"relation: målpunktet vil erstatte det originale punkt i relationen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Anvend denne rolle for alle medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr ""
+msgstr "Orig. vej"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
 msgid "Decision"
-msgstr ""
+msgstr "Beslutning"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
+"<html>Marker venligst de værdier der skal beholdes for de følgende tags.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
 msgid "Show tags with conflicts only"
-msgstr ""
+msgstr "Vis kun tags med konflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:168
 msgid "For selected objects only"
-msgstr ""
+msgstr "Kun for de valgte elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:169
@@ -5282,17 +5445,20 @@
 "html>"
 msgstr ""
+"Markér for kun at vise rettesæt for de aktuelt markerede objekter."
+"<br>Afmarkér for at vise alle rettesæt for objekter i det aktuelle data lag."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:262
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Åbn listen af rettesæt i det nuværende lag."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:307
 msgid "Select all objects assigned to the currently selected changesets"
-msgstr ""
+msgstr "Marker alle objekter tilhørende de aktuelt markerede rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:366
@@ -5304,26 +5470,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:367
 msgid "Download information about the selected changesets from the OSM server"
-msgstr ""
+msgstr "Download information om de markerede rettesæt fra OSM serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:402
 msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Lukker de markerede åbne rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:433
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:176
 msgid "Show info"
-msgstr ""
+msgstr "Vis information"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:434
 msgid "Open a web page for each selected changeset"
-msgstr ""
+msgstr "Åbn en webside for hvert markeret rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:473
 msgid "Details"
-msgstr ""
+msgstr "Detaljer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:474
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
+msgstr "Åbner rettesætsmanagervinduet for de markerede rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5342,5 +5508,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5349,10 +5515,10 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 #, java-format
 msgid "Toggle: {0}"
-msgstr "Skift: {0}"
+msgstr "Slå til/fra: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
@@ -5363,5 +5529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
 msgid "Resolve conflicts."
-msgstr ""
+msgstr "Løs konfilkter."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
@@ -5381,24 +5547,26 @@
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
+"Sæt de markerede elementer på kortet til de markerede genstande i listen "
+"ovenfor."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167
 msgid "Cancel conflict resolution and close the dialog"
-msgstr ""
+msgstr "Abryd konfliktløsning og luk dialogen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
 msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
+msgstr "Anvend løste konflikter og luk dialogen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
 msgid "Apply Resolution"
-msgstr ""
+msgstr "Anvend løsning"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213
 msgid "Close anyway"
-msgstr ""
+msgstr "Luk alligevel"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
 msgid "Continue resolving"
-msgstr ""
+msgstr "Fortsæt løsning"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
@@ -5414,5 +5582,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Konflikt er ikke helt løst"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261
@@ -5423,20 +5591,20 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Løste konflikter for ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
 msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "Filtrér objekter og skjul/deaktiver dem."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Tilføj"
@@ -5444,41 +5612,41 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 msgid "Add filter."
-msgstr ""
+msgstr "tilføj filter."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
 msgid "Edit filter."
-msgstr ""
+msgstr "Redigér filter."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 msgid "Delete filter."
-msgstr ""
+msgstr "Slet filter."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Move filter up."
-msgstr ""
+msgstr "Flyt filter op."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Move filter down."
-msgstr ""
+msgstr "Flyt filter ned."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Enable filter"
-msgstr ""
+msgstr "Slå filter til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130
 msgid "Hide elements"
-msgstr ""
+msgstr "Skjul elementer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Apply also for children"
-msgstr ""
+msgstr "Anvend også for børn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Inverse filter"
-msgstr ""
+msgstr "Omvend filter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134
 msgid "Filter mode"
-msgstr ""
+msgstr "Filtertilstand"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
@@ -5493,5 +5661,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
 msgid "Object with history"
-msgstr ""
+msgstr "Objekt med historik"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
@@ -5509,13 +5677,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
 msgid "Show"
-msgstr ""
+msgstr "Vis"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
 msgid "Display the history of the selected objects."
-msgstr ""
+msgstr "Vis de markerede objekters historik"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83
 msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
+msgstr "Dialog ikke oprettet endnu. Start createInstance() først"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
@@ -5530,5 +5698,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
 msgid "Delete the selected layers."
-msgstr ""
+msgstr "Slet de markerede lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
@@ -5538,18 +5706,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
 msgid "Toggle visible state of the selected layer."
-msgstr "Skift synligheden for det valgte lag."
+msgstr "Slå synligheden for det valgte lag til/fra"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
-msgstr ""
+msgstr "Aktivér"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:369
 msgid "Activate the selected layer"
-msgstr ""
+msgstr "Aktiver de markerede lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
 msgid "Merge this layer into another layer"
-msgstr ""
+msgstr "Flet dette lag ind i et andet lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:536
@@ -5563,60 +5731,61 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
 msgid "Information about layer"
-msgstr ""
+msgstr "Information om lag"
 
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Åbn en liste over alle relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Åbn en editor for den valgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Slet de nvalgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Opret en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+"Opret en kopi af denne relation og åbn den i et andet redigeringsvindue"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+msgstr "Sæt den nuværende markering til listen over markerede relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+msgstr "Marker medlemmerne af alle markerede relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+msgstr "Vælg medlemmer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+msgstr "Hent alle medlemmer af de markerede relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
-msgstr ""
+msgstr "Download medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
@@ -5680,14 +5849,14 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Forfatter"
+msgstr[1] "{0} Forfattere"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:146
 msgid "Select primitives submitted by this user"
-msgstr ""
+msgstr "Markér primitiver indsendt af denne bruger"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:177
 msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "starter en browser med information om brugeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:189
@@ -5696,4 +5865,6 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
+"Advarsel: Starter kun infobrowsere for de første {0} af {1} markerede "
+"brugere."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212
@@ -5703,8 +5874,10 @@
 "this system.</html>"
 msgstr ""
+"Kunne ikke oprette en URL fordi kodningen \"{0}\"<br>manglede på dette "
+"system.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
 msgid "Missing encoding"
-msgstr ""
+msgstr "Manglende kodning"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:276
@@ -5718,69 +5891,69 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
 msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Vis rettesættets grundlæggende egenskaber"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
 msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Vis rettesættets tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
 msgid "Content"
-msgstr ""
+msgstr "Indhold"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
 msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr ""
+msgstr "Vis objekterne oprettet,opdateret og slettet af rettesættet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125
 msgid "Close the dialog"
-msgstr ""
+msgstr "Luk dialogen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
 msgid "Query"
-msgstr ""
+msgstr "Forespørgsel"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
 msgid "Launch the dialog for querying changesets"
-msgstr ""
+msgstr "Start rettesætsforespørgselsdialogen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265
 msgid "Remove from cache"
-msgstr ""
+msgstr "Fjern fra mellemlager"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
 msgid "Remove the selected changesets from the local cache"
-msgstr ""
+msgstr "Fjern de markerede rettesæt fra den lokale cache"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
 msgid "Close the selected changesets"
-msgstr ""
+msgstr "Luk de markerede rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323
 msgid "Update changeset"
-msgstr ""
+msgstr "Opdater rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
+msgstr "Opdaterer de markerede rettesæt med aktuelle data fra OSM serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr ""
+msgstr "Hent indhold af rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
 msgid "Download the content of the selected changesets from the server"
-msgstr ""
+msgstr "Hent indholdet af de markerede rettesæt fra serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
 msgid "My changesets"
-msgstr ""
+msgstr "Mine rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr ""
+msgstr "Hent mine rettesæt fra OSM serveren (max 100 rettesæt)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
@@ -5790,19 +5963,26 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
+"<html>JOSM kører nu med en anonym bruger. Den kan ikke hente<br>dine "
+"rettesæt fra OSM-serveren medmindre du indtaster dit OSM-brugernavn<br>i "
+"JOSM-indstillingerne.</html>\r\n"
+"\r\n"
+"is currently running with an anonymous user. It can't download<br>your "
+"changesets from the OSM server unless you enter your OSM user name<br>in the "
+"JOSM preferences.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
 msgctxt "changeset.upload-comment"
 msgid "empty"
-msgstr ""
+msgstr "tom"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
 msgctxt "changeset.open"
 msgid "Open"
-msgstr ""
+msgstr "Åben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
 msgctxt "changeset.open"
 msgid "Closed"
-msgstr ""
+msgstr "Lukket"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
@@ -5810,13 +5990,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
 msgid "anonymous"
-msgstr ""
+msgstr "anonym"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
 msgid "Open"
-msgstr ""
+msgstr "Åben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
@@ -5827,9 +6007,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr ""
+msgstr "Oprettet ved"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
 msgid "Closed at"
-msgstr ""
+msgstr "Lukket"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
@@ -5839,5 +6019,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
 msgid "Downloading changeset content"
-msgstr ""
+msgstr "Henter indhold af rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
@@ -5845,15 +6025,15 @@
 #, java-format
 msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-msgstr ""
+msgstr "Forventede heltalsværdi > 0 for parameter ''{0}''. Fik ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Henter rettesæt {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Henter indhold af rettesæt {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -5862,5 +6042,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
 msgid "Download content"
-msgstr ""
+msgstr "Download indhold"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
@@ -5869,33 +6049,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Hent indhold af rettesæt fra OSM-serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310
 msgid "Update content"
-msgstr ""
+msgstr "Opdatér indhold"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
 msgid "Update the changeset content from the OSM server"
-msgstr ""
+msgstr "Opdatér indhold af rettesæt fra OSM-serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
 msgid "Show history"
-msgstr ""
+msgstr "Vis historik"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr ""
+msgstr "Hent og vis de markerede primitivers historik"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
 msgid "Select in layer"
-msgstr ""
+msgstr "Markér i lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
 msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Markér de tilsvarende primitiver i det nuværende datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
@@ -5909,52 +6089,56 @@
 "''{0}''.</html>"
 msgstr[0] ""
+"<html>Det markerede objekt er ikke tilgængeligt i det "
+"nuværende<br>redigeringslag ''{0}''.</html>"
 msgstr[1] ""
+"<html>Ingen af de markerede objekter er tilgængelige i det "
+"nuværende<br>redigeringslag ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
 msgid "Nothing to select"
-msgstr ""
+msgstr "Intet at vælge"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:425
 msgid "Zoom to in layer"
-msgstr ""
+msgstr "Zoom til i lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Zoom til de tilsvarende primitiver i det nuværende datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Intet at zoome ind på"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
 msgid "The content of this changeset is not downloaded yet."
-msgstr ""
+msgstr "Indholdet af dette rettesæt er ikke hentet endnu."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download now"
-msgstr ""
+msgstr "Download nu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
-msgstr ""
+msgstr "Hent indholdet af rettesættet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr ""
+msgstr "Oprettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
 msgid "Updated"
-msgstr ""
+msgstr "Opdateret"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
 msgid "Deleted"
-msgstr ""
+msgstr "Slettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6850,43 +7034,43 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
 msgid "Comment:"
-msgstr ""
+msgstr "Kommentar:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr ""
+msgstr "Åben/lukket:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
 msgid "Created by:"
-msgstr ""
+msgstr "Oprettet af:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
 msgid "Created on:"
-msgstr ""
+msgstr "Oprettet den:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
 msgid "Closed on:"
-msgstr ""
+msgstr "Lukket den:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
 msgctxt "changeset.state"
 msgid "Open"
-msgstr ""
+msgstr "Åben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
 msgctxt "changeset.state"
 msgid "Closed"
-msgstr ""
+msgstr "Lukket"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
 msgid "Remove the changeset in the detail view panel from the local cache"
-msgstr ""
+msgstr "Fjern rettesættet i detaljepanelet fra den lokale cache"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
 msgid "Update the changeset from the OSM server"
-msgstr ""
+msgstr "Opdatér rettesættet fra OSM-serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
@@ -6894,5 +7078,5 @@
 "Select the primitives in the content of this changeset in the current data "
 "layer"
-msgstr ""
+msgstr "Markér primitiverne i dette rettesæts indhold i det nuværende datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -6903,4 +7087,6 @@
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
+"Ingen af objekterne i rettesæt {0}s indhold er tilgængelige i det "
+"nuværende<br>redigeringslag ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
@@ -6909,4 +7095,5 @@
 "layer"
 msgstr ""
+"Zoom til primitiverne i dette rettesæts indhold i det nuværende datalag"
 
 #. parent for dialog is Main.parent
@@ -6914,26 +7101,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr ""
+msgstr "Hent rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [ufuldstændig]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "open"
-msgstr ""
+msgstr "åben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "closed"
-msgstr ""
+msgstr "lukket"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
 msgid "Changeset ID: "
-msgstr ""
+msgstr "Rettesæt ID: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changset id"
-msgstr ""
+msgstr "Indtast et rettesætsID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -6941,4 +7128,5 @@
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
+"Hent rettesættet med det specificerede ID, inklusive rettesættets indhold."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -6947,161 +7135,178 @@
 "> 0"
 msgstr ""
+"Den nuværende værdi er ikke et gyldigt rettesætsID. Indtast venligst en "
+"heltalsværdi > 0."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+msgstr "Indtast venligst en heltalsværdi > 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+msgstr "Markér rettesæt ejet af specifikke brugere"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+msgstr "Vælg rettesæt afhængigt af om de er åbne eller lukkede"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+"Vælg rettesæt baseret på den dato/tid de er blevet oprettet eller lukket"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+msgstr "Markér kun rettesæt relateret til et specifikt afgrænsningsfelt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+msgstr "Forespørg kun åbne rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+msgstr "Forespørg kun lukkede rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+msgstr "Forespørg både åbne og lukkede rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+msgstr "Bruger ID: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+msgstr "Bruger navn: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+msgstr "Kun rettesæt ejet af mig selv"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+msgstr "Kun rettesæt ejet af brugeren med det følgende brugerID"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+msgstr "Kun rettesæt ejet af brugeren med det følgende brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
 "is anonymous"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+"Kan ikke begrænse rettesætsforespørgsel til den nuværende bruger, fordi den "
+"nuværende bruger er anonym"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+msgstr "Nuværende værdi ''{0}'' for brugerID er ikke gyldig"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+msgstr "Kan ikke begrænse rettesætsforespørgslen til brugernavnet \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+msgstr "Indtast venligst en gyldig bruger ID"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+msgstr "Ugyldigt bruger ID"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+msgstr "Indtast venligst et ikke-tomt brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+msgstr "Ugyldigt brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+msgstr "Dato: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+msgstr "Lukket efter - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+msgstr "Oprettet før - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+msgstr "Kun rettesæt lukket efter den følgende dato/tid"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+msgstr "Kun rettesæt lukket efter og oprettet før en specifik dato/tid"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+"Kan ikke forme rettesætsforespørgsel med tidsbaserede begrænsninger. Input "
+"er ikke gyldigt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
 "specific time range.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+"<html>Indtast venligst gyldige dato/tid-værdier for at "
+"begrænse<br>forespørgslen til et specifikt tidsinterval.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+msgstr "Ugyldige dato/tids-værdier"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
 "invalid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+"Kan ikke begrænse rettesætsforespørgslen til et specifikt afgrænsningsfelt. "
+"Inputtet er ugyldigt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
 "changeset query to a specific bounding box.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+"<html>Indtast venligst gyldige længde/breddegradsværdier for at "
+"begrænse<br>rettesætsforespørgslen til et specifikt afgrænsningsfelt.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+msgstr "Ugyldigt afgrænsningsfelt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+"Den nuværende værdi er ikke et gyldigt brugerID. Indtast venligst en "
+"heltalsværdi > 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+"<html>Den nuværende værdi er ikke et gyldigt brugernavn.<br>Indtast venligst "
+"et ikke-tomt brugernavn.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+msgstr "Indtast venligst et ikke-tomt brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7109,6 +7314,8 @@
 "<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+"Indtast venligst en dato i det normale format for din lokalitet."
+"<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7116,8 +7323,10 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
+"Indtast venligst en gyldig tid i det normale format for din lokalitet."
+"<br>Eksempel: {0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Hent kun mine rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7126,4 +7335,6 @@
 "include all changesets in the query.</html>"
 msgstr ""
+"<html>Markér for at begrænse forespørgslen til kun dine rettesæt."
+"<br>Afmarkér for at inkludere alle rettesæt i forespørgslen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7133,97 +7344,105 @@
 "default query."
 msgstr ""
+"Advarsel: Uventet værdi for indstilling ''{0}''. Fik ''{1}''. Nulstiller til "
+"standard forespørgsel."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Grundlæggende"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
-msgstr ""
+msgid "Download changesets using predefined queries"
+msgstr "Hent rettesæt ved hjælp af fordefinerede forespørgsler"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "Fra URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
-msgstr ""
+msgid "Query changesets from a server URL"
+msgstr "Forespørg rettesæt fra en server URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
 msgid "Advanced"
-msgstr ""
+msgstr "Avanceret"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
-msgstr ""
+msgid "Use a custom changeset query"
+msgstr "Brug en brugerdefineret rettesætsforespørgsel"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Forespørg rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Forespørg og hent rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr ""
+msgstr "Indtast venligst en gyldig rettesætsforespørgselsURL først."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "Ulovlig rettesætsforespørgselsURL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "Luk dialogen og afbryd forespørgsel af rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Forespørger og henter rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Bestem brugerID for nuværende bruger..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Forespørg og hent rettesæt ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+msgstr "URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+"Indtast eller indsæt venligst en URL for at hente rettesæt fra OSM API'et."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr "Eksempler"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Bemærk at rettesætsforespørgsler for øjeblikket altid indsendes til ''{0}'', "
+"uanset den herunder indtastede URL's vært, port og sti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+msgstr "Denne rettesætsforespørgselsURL er ugyldig"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+msgstr[0] "Dette vil ændre {0} objekt."
+msgstr[1] "Dette vil ændre op til {0} objekter."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+msgstr "En tom værdi sletter taggen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7232,10 +7451,10 @@
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Ret værdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7244,5 +7463,5 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7251,9 +7470,9 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
@@ -7281,81 +7500,77 @@
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det valgte fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Slet {0} relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr "Markér relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Vælg linjetegnings-indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr "Markér relation i hovedmarkering."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Vælg linjetegnings-indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr "Markér i relationsliste"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Vælg linjetegnings-indstillinger"
+msgstr "Markér relation i relationsliste."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 msgid "Edit the relation the currently selected relation member refers to."
-msgstr ""
+msgstr "Rediger relationen det nu markerede relationsmedlem refererer til."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
 msgid "Download all child relations (recursively)"
-msgstr ""
+msgstr "Hent alle børnerelationer (rekursivt)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
 msgid "Download All Children"
-msgstr ""
+msgstr "Hent alle børn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
 msgid "Download selected relations"
-msgstr ""
+msgstr "Download valgte relationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
 msgid "Download Selected Children"
-msgstr ""
+msgstr "Hent markerede børn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
@@ -7364,5 +7579,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
 msgid "Download relation members"
-msgstr ""
+msgstr "Hent relationsmedlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
@@ -7377,8 +7592,9 @@
 "loaded"
 msgstr ""
+"<html>Børnerelationen<br>{0}<br>er slettet fra serveren. Den kan ikke hentes."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
 msgid "Relation is deleted"
-msgstr ""
+msgstr "Relation er slettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
@@ -7386,13 +7602,14 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr ""
+msgstr "Downloading relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
+"Advarsel: Ignorerer undtagelse fordi opgave er annuleret. Undtagelse: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85
@@ -7400,36 +7617,36 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+msgstr[0] "Henter {0} ufuldstændigt barn af relation ''{1}''"
+msgstr[1] "Henter {0} ufuldstændige børn af relation ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+msgstr "Download relationer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}: Henter relation ''{2}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
 msgid "Tags and Members"
-msgstr ""
+msgstr "Tags og medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
 msgid "Parent Relations"
-msgstr ""
+msgstr "Forældrerelationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
 msgid "Child Relations"
-msgstr ""
+msgstr "Barnerelationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 msgid "Apply Role:"
-msgstr ""
+msgstr "Anvend rolle:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
 msgid "Enter a role and apply it to the selected relation members"
-msgstr ""
+msgstr "Indtast en rolle og brug den med de markerede relationsmedlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
@@ -7439,13 +7656,16 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
+"<html>Der er mindst et medlem i denne relation, der refererer<br>til "
+"relationen selv.<br>Dette medfører cirkulære afhængigheder og frarådes."
+"<br>Hvordan ønsker du at fortsætte med cirkulære afhængigheder?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
 msgid "Remove them, clean up relation"
-msgstr ""
+msgstr "Fjern dem og ryd op i relationen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
 msgid "Ignore them, leave relation as is"
-msgstr ""
+msgstr "Ignorer dem og lad relationen være som den er."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
@@ -7456,8 +7676,11 @@
 "html>"
 msgstr ""
+"<html>Denne relation har allerede en eller flere medlemmer der refererer "
+"til<br>primitiven ''{0}''<br><br>Ønsker du virkelig at tilføje endnu et "
+"relationsmedlem?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Multiple members referring to same primitive"
-msgstr ""
+msgstr "Flere medlemmer der refererer til samme primitiv."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
@@ -7468,4 +7691,7 @@
 "''{0}''.</html>"
 msgstr ""
+"<html>Du forsøger at tilføje en relation til sig selv.<br><br>Dette medfører "
+"cirkulære afhængigheder og frarådes derfor.<br>Springer over relation "
+"''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
@@ -7473,4 +7699,5 @@
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
+"Tilføj alle primitiver markeret i det nuværende datasæt før det første medlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
@@ -7478,4 +7705,6 @@
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
+"Tilføj alle primitiver markeret i det nuværende datasæt efter det sidste "
+"medlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
@@ -7484,4 +7713,6 @@
 "member"
 msgstr ""
+"Tilføj alle primitiver markeret i det nuværende datasæt før det først "
+"markerede medlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
@@ -7490,13 +7721,15 @@
 "member"
 msgstr ""
+"Tilføj alle primitiver markeret i det nuværende datasæt efter det sidst "
+"markerede medlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
 msgid "Remove all members referring to one of the selected primitives"
-msgstr ""
+msgstr "Fjern alle medlemmer der refererer til en af de markerede primitiver"
 
 #. putValue(NAME, tr("Remove Selected"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
 msgid "Relation Editor: Remove Selected"
-msgstr ""
+msgstr "Relationseditor: Fjern markerede"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
@@ -7505,4 +7738,6 @@
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
+"Markér relationsmedlemmer der refererer til primitiver i den nuværende "
+"markering"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
@@ -7512,32 +7747,34 @@
 "selection"
 msgstr ""
+"Markér relationsmedlemmer der refererer til {0} primitiver i den nuværende "
+"markering"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
 msgid "Select primitives for selected relation members"
-msgstr ""
+msgstr "Markér primitiver for markerede relationsmedlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
 msgid "Sort the relation members"
-msgstr ""
+msgstr "Sortér relationsmedlemmerne"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
 msgid "Sort"
-msgstr ""
+msgstr "Sortér"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Relation Editor: Sort"
-msgstr ""
+msgstr "Relationseditor: Sortér"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Reversér relationsmedlemmernes rækkefølge"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
 msgid "Reverse"
-msgstr ""
+msgstr "Omvendt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Relation Editor: Reverse"
-msgstr ""
+msgstr "Relationseditor: Reversér"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
@@ -7548,5 +7785,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
 msgid "Relation Editor: Move Up"
-msgstr ""
+msgstr "Relationseditor: Flyt op"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
@@ -7557,35 +7794,35 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Relation Editor: Move Down"
-msgstr ""
+msgstr "Relationseditor: Flyt ned"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
 msgid "Remove the currently selected members from this relation"
-msgstr ""
+msgstr "Fjern de nu markerede medlemmer fra denne relation"
 
 #. putValue(NAME, tr("Remove"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
 msgid "Relation Editor: Remove"
-msgstr ""
+msgstr "Relationseditor: Fjern"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
 msgid "Delete the currently edited relation"
-msgstr ""
+msgstr "Slet den nu redigerede relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Ja, opret en konflikt og luk"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
 msgid "Click to create a conflict and close this relation editor"
-msgstr ""
+msgstr "Klik for at oprette en konflikt og lukke denne relationseditor"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
 msgid "No, continue editing"
-msgstr ""
+msgstr "Nej, fortsæt redigeringen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
-msgstr ""
+msgstr "Klik for at returnere til relationseditoren og genoptage redigeringen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
@@ -7595,8 +7832,11 @@
 "conflict and close the editor?</html>"
 msgstr ""
+"<html>Denne relation er blevet ændret udenfor editoren.<br>Du kan ikke tage "
+"dine ændringer i anvendelse og fortsætte redigeringen.<br><br>Ønsker du at "
+"oprette en konflikt og lukke editoren?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Conflict in data"
-msgstr ""
+msgstr "Konflikt i data"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
@@ -7606,4 +7846,6 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
+"<html>Lag ''{0}'' har allerede en konflikt for primitiv<br>''{1}''.<br>Løs "
+"venligst denne konflikt først og prøv så igen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
@@ -7621,9 +7863,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
 msgid "Add an empty tag"
-msgstr ""
+msgstr "Tilføj en tom tag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
 msgid "Download all incomplete members"
-msgstr ""
+msgstr "Hent alle ufuldstændige medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
@@ -7635,17 +7877,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
 msgid "Relation Editor: Download Members"
-msgstr ""
+msgstr "Relationseditor: Hent medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
 msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Hent markerede ufuldstændige medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
 msgid "Sets a role for the selected members"
-msgstr ""
+msgstr "Sæt en rolle for valgte medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
 msgid "Apply Role"
-msgstr ""
+msgstr "Anvend rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
@@ -7656,50 +7898,53 @@
 "new role?</html>"
 msgstr ""
+"<html>Du giver {0} primitiver en tom rolle.<br>Dette svarer til at slette "
+"disse primitivers roller.<br>Ønsker du virkelig at anvende den nye rolle?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
 msgid "Yes, apply it"
-msgstr ""
+msgstr "Ja, anvend den"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
 msgid "No, don't apply"
-msgstr ""
+msgstr "Nej, anvend den ikke"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
 msgid "Confirm empty role"
-msgstr ""
+msgstr "Bekræft tom rolle"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
 msgid "Edit the relation the currently selected relation member refers to"
-msgstr ""
+msgstr "Redigér relationen det nu markerede relationsmedlem refererer til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
 msgid "Zoom to"
-msgstr ""
+msgstr "Zoom til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221
 msgid "Zoom to the object the first selected member refers to"
-msgstr ""
+msgstr "Zoom til det objekt det først markerede medlem refererer til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
+msgstr "Zooming deaktiveret fordi denne relations lag ikke er aktivt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
 msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Zooming deaktiveret fordi der ikke er noget markeret medlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
 msgid "Refers to"
-msgstr ""
+msgstr "Refererer til"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
-msgstr ""
+msgstr "Henter refererende relationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
-msgstr ""
+msgstr "Værdi af child.getId() > 0 forventet. Fik {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
@@ -7707,20 +7952,21 @@
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
+"Advarsel: Ignorerer undtagelse fordi opgave er annulleret. Undtagelse: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
 msgid "including immediate children of parent relations"
-msgstr ""
+msgstr "Inkluderer umiddelbare børn af forældrerelationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
 msgid "Load parent relations"
-msgstr ""
+msgstr "Hent forældrerelationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
 msgid "Loading parent relations"
-msgstr ""
+msgstr "Henter forældrerelationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
 msgid "Edit the currently selected relation"
-msgstr ""
+msgstr "Rediger den nu markerede relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -7731,39 +7977,40 @@
 #, java-format
 msgid "Create new relation in layer ''{0}''"
-msgstr ""
+msgstr "Opret ny relation i lag \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135
 #, java-format
 msgid "Edit new relation in layer ''{0}''"
-msgstr ""
+msgstr "Rediger ny relation i lag ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137
 #, java-format
 msgid "Edit relation #{0} in layer ''{1}''"
-msgstr ""
+msgstr "Rediger relation #{0} i lag ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Indlæs relationer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
+"Advarsel: Ignorerer undtagelse fordi opgave blev annulleret. Undtagelse var: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr ""
+msgstr "Vej er forbundet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr ""
+msgstr "Vej er forbundet til foregående relationsmedlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr ""
+msgstr "Vej er forbundet til næste relationsmedlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
-msgstr ""
+msgstr "Vej er ikke forbundet til foregående eller næste relationsmedlem"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
@@ -7773,5 +8020,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
 msgid "<html>There is currently no download area selected.</html>"
-msgstr ""
+msgstr "<html>Der er ikke aktuelt markeret noget område at hente.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
@@ -7781,12 +8028,14 @@
 "maxlon): {0}, {1}, {2}, {3}</html>"
 msgstr ""
+"<html><strong>Nuværende område</strong> (minlat, minlon, maxlat, maxlon): "
+"{0}, {1}, {2}, {3}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
 msgid "Create bookmark"
-msgstr ""
+msgstr "Opret bogmærke"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
 msgid "Add a bookmark for the currently selected download area"
-msgstr ""
+msgstr "Tilføj et bogmærke for det nu markerede område"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
@@ -7794,22 +8043,24 @@
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
+"Der er lige nu ikke markeret noget område at hente fra. Markér venligst et "
+"område først."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
 msgid "Please enter a name for the bookmarked download area."
-msgstr ""
+msgstr "Indtast venligst et navn for det bogmærkede område."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
 msgid "Name of location"
-msgstr ""
+msgstr "Navn på sted"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
 msgid "Remove the currently selected bookmarks"
-msgstr ""
+msgstr "Fjern det nuværende valg af bogmærker"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
 msgid "Rename the currently selected bookmark"
-msgstr ""
+msgstr "Omdøb det valgte bogmærke"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
@@ -7847,20 +8098,20 @@
 #, java-format
 msgid "The string ''{0}'' isn''t a valid double value."
-msgstr ""
+msgstr "Strengen ''{0}'' er ikke en gyldig double-værdi"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
-msgstr ""
+msgstr "Værdi for breddegrad i intervallet [-90,90] krævet."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
-msgstr ""
+msgstr "Værdi for længdegrad i intervallet [-180,180] krævet."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
-msgstr ""
+msgstr "Indsæt URL fra udklipsholder"
 
 #. adding the download tasks
@@ -7875,5 +8126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
 msgid "Select to download OSM data in the selected download area."
-msgstr ""
+msgstr "Markér for at hente OSM-data i det markerede område."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
@@ -7883,5 +8134,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
 msgid "Select to download GPS traces in the selected download area."
-msgstr ""
+msgstr "Markér for at hente GPS-spor i det markerede område."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
@@ -7894,4 +8145,6 @@
 "into the currently active data layer.</html>"
 msgstr ""
+"<html>Markér for at hente data ind i et nyt datalag.<br>Afmarkér for at "
+"hente data ind i det nu aktive datalag.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:124
@@ -7901,5 +8154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "No area selected yet"
-msgstr ""
+msgstr "Ingen arealer valgt endnu"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
@@ -7915,13 +8168,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
 msgid "Click to close the dialog and to abort downloading"
-msgstr ""
+msgstr "Klik for at lukke dialogen og afbryde downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
 msgid "Click do download the currently selected area"
-msgstr ""
+msgstr "Klik for at hente det nu markerede område"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
 msgid "Please select a download area first."
-msgstr ""
+msgstr "Markér venligst et område at hente fra først."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
@@ -7931,26 +8184,28 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
+"<html>Hverken <strong>{0}</strong> eller <strong>{1}</strong> er aktiveret."
+"<br>Vælg venligst enten at hente OSM-data, GPX-data eller begge.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Class Type"
-msgstr ""
+msgstr "Klassetype"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
-msgstr ""
+msgstr "Grænser"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
 msgid "Near"
-msgstr ""
+msgstr "Nær"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
 msgctxt "placeselection"
 msgid "Zoom"
-msgstr ""
+msgstr "Zoom"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
 msgid "Choose the server for searching:"
-msgstr ""
+msgstr "Vælg server for søgning:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
@@ -7960,9 +8215,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
 msgid "Enter a place name to search for"
-msgstr ""
+msgstr "Indtast et stednavn at søge efter"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
 msgid "Areas around places"
-msgstr ""
+msgstr "Områder omkring steder"
 
 #. SAXException does not chain correctly
@@ -7973,17 +8228,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
 msgid "Search ..."
-msgstr ""
+msgstr "Søg ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Click to start searching for places"
-msgstr ""
+msgstr "Klik for at begynde søgning efter steder"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
 msgid "Querying name server"
-msgstr ""
+msgstr "Forespørger på navneserver"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Forespørger på navneserver ..."
 
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
@@ -8022,6 +8277,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8054,4 +8310,7 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
+"<b>Zoom:</b> Musehjul, dobbeltklik or Ctrl + op/ned <b>Flyt kort:</b> Hold "
+"højre museknap og flyt musen eller brug piletaster. <b>Markér:</b> Hold "
+"venstre museknap og træk en ramme."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -8083,9 +8342,9 @@
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
+msgstr "Kunne ikke læse CSS-filen ''help-browser.css''. Undtagelse er: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188
 msgid "JOSM Help Browser"
-msgstr ""
+msgstr "JOSM browser for hjælp"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:228
@@ -8116,18 +8375,20 @@
 "network problem, please check your<br>your internet connection</html>"
 msgstr ""
+"<html>Kunne ikke åbne hjælpeside for URL {0}.<br>Dette skyldes sandsynligvis "
+"et netværksproblem. Tjek venligst din<br> internetforbindelse.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:357
 msgid "Failed to open URL"
-msgstr ""
+msgstr "Kunne ikke åbne URL"
 
 #. putValue(NAME, tr("Open in Browser"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:390
 msgid "Open the current help page in an external browser"
-msgstr ""
+msgstr "Åbn den nuværende hjælpeside i en ekstern browser"
 
 #. putValue(NAME, tr("Edit"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:402
 msgid "Edit the current help page"
-msgstr ""
+msgstr "Redigér den nuværende hjælpeside"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:409
@@ -8137,71 +8398,73 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
+"<html>Den nuværende URL <tt>{0}</tt><br>er en ekstern URL. Redigering er kun "
+"mulig for hjælpeemner<br>på hjælpeserveren <tt>{1}</tt>.</html>"
 
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:432
 msgid "Reload the current help page"
-msgstr ""
+msgstr "Hent den nuværende hjælpeside igen"
 
 #. putValue(NAME, tr("Back"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:447
 msgid "Go to the previous page"
-msgstr ""
+msgstr "Gå til foregående side"
 
 #. putValue(NAME, tr("Forward"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:467
 msgid "Go to the next page"
-msgstr ""
+msgstr "Gå til næste side"
 
 #. putValue(NAME, tr("Home"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:483
 msgid "Go to the JOSM help home page"
-msgstr ""
+msgstr "Gå til JOSM hjælp på hjemmesiden"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:514
 msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
+msgstr "Advarsel: Dårligt sted i HTML dokument. Undtagelse var: "
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:564
 msgid "Failed to open help page. The target URL is empty."
-msgstr ""
+msgstr "Kunne ikke åben hjælpeside. URL er tom."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:565
 msgid "Failed to open help page"
-msgstr ""
+msgstr "Kunne ikke åbne hjælpeside"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
 msgid "Latitude: "
-msgstr ""
+msgstr "Breddegrad: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
 msgid "Longitude: "
-msgstr ""
+msgstr "Længdegrad: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
 msgid "Coordinates"
-msgstr ""
+msgstr "Koordinater"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
 #, java-format
 msgid "History for node {0}"
-msgstr ""
+msgstr "Historik for punkt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "Historik for vej {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
 #, java-format
 msgid "History for relation {0}"
-msgstr ""
+msgstr "Historik for relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
 msgid "Reload the history from the server"
-msgstr ""
+msgstr "Hent historikken fra serveren igen"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
+msgstr "Historik ikke initialiseret endnu. Kunne ikke lave referenceprimitiv"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
@@ -8211,4 +8474,5 @@
 "Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
+"Kunne ikke lave reference. Reference-ID {0} matcher ikke historik-ID {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
@@ -8217,8 +8481,9 @@
 "Failed to set reference. Reference version {0} not available in history."
 msgstr ""
+"Kunne ikke lave reference. Reference version {0} ikke tilgængelig i historik."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
+msgstr "Historik ikke initialiseret endnu. Kunne ikke lave nuværende primitiv."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
@@ -8228,39 +8493,41 @@
 "history."
 msgstr ""
+"Kunne ikke lave nuværende primitiv. Nuværende version {0} ikke tilgængelig i "
+"historik."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:54
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
 msgid "Load history"
-msgstr ""
+msgstr "Indlæs historik"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:80
 #, java-format
 msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr ""
+msgstr "Parameter ''{0}'' > 0 forventet. Fik {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
 #, java-format
 msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr ""
+msgstr "ID i parameter ''{0}'' > 0 forventet. Fik {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
-msgstr ""
+msgstr "Objekt-ID > 0 forventet. Fik {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:195
 #, java-format
 msgid "Loading history for node {0}"
-msgstr ""
+msgstr "Henter historik for punkt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:196
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Henter historik for vej {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:197
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr ""
+msgstr "Henter historik for relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -8268,36 +8535,36 @@
 #, java-format
 msgid "Node {0}"
-msgstr ""
+msgstr "Punkt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr ""
+msgstr "Zoom til punkt"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
 msgid "Zoom to this node in the current data layer"
-msgstr ""
+msgstr "Zoom til dette punkt i det nuværende datalag"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
 msgid "Open a history browser with the history of this node"
-msgstr ""
+msgstr "Åbn er historikbrowser med dette punkts historik"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
 #, java-format
 msgid "Way {0}"
-msgstr ""
+msgstr "Vej {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
 #, java-format
 msgid "Relation {0}"
-msgstr ""
+msgstr "Relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
 msgid "not present"
-msgstr ""
+msgstr "ikke tilgængelig"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
-msgstr ""
+msgstr "Rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
@@ -8305,5 +8572,5 @@
 msgid ""
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
-msgstr ""
+msgstr "<html>Version <strong>{0}</strong> nu redigeret i lag ''{1}''</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
@@ -8312,45 +8579,46 @@
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 msgstr ""
+"<html>Version <strong>{0}</strong> oprettet den <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Changeset info"
-msgstr ""
+msgstr "Rettesætsinfo"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Start browser med information om rettesættet"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
 #, java-format
 msgid "Show changeset {0}"
-msgstr ""
+msgstr "Vis rettesæt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:62
 #, java-format
 msgid "Version {0}, {1} (by {2})"
-msgstr ""
+msgstr "Version {0}, {1} (af {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:78
 #, java-format
 msgid "Version {0} created on {1} by {2}"
-msgstr ""
+msgstr "Version {0} oprettet den {1} af {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
 #, java-format
 msgid "Version {0} in editor"
-msgstr ""
+msgstr "Version {0} i editor"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
 msgid "[deleted]"
-msgstr ""
+msgstr "[slettet]"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
 #, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr ""
+msgstr "Version {0} nu redigeret i datalag ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
 msgid "Version"
-msgstr ""
+msgstr "Version"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62
@@ -8359,4 +8627,6 @@
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
+"Kunne ikke opdatere primitiv med ID {0} fordi det nuværende redigeringslag "
+"er nul."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -8366,19 +8636,21 @@
 "include such a primitive"
 msgstr ""
+"Kunne ikke opdatere primitiv med ID {0} fordi det nuværende redigeringslag "
+"ikke indeholder sådan en primitiv"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
 #, java-format
 msgid "Synchronize node {0} only"
-msgstr ""
+msgstr "Synkroniser kun punkt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95
 #, java-format
 msgid "Synchronize way {0} only"
-msgstr ""
+msgstr "Synkroniser kun vej {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96
 #, java-format
 msgid "Synchronize relation {0} only"
-msgstr ""
+msgstr "Synkroniser kun relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106
@@ -8403,5 +8675,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
 msgid "Conflicts detected"
-msgstr ""
+msgstr "Konflikt opdaget"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166
@@ -8424,9 +8696,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
 msgid "Changeset closed"
-msgstr ""
+msgstr "Rettesæt lukket"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
 msgid "Prepare conflict resolution"
-msgstr ""
+msgstr "Forbered konfliktløsning"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216
@@ -8437,5 +8709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
 msgid "Click to cancel and to resume editing the map"
-msgstr ""
+msgstr "Klik for at annullere og genoptage redigering af kortet"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226
@@ -8447,8 +8719,12 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
+"<html>Uploading <strong>fejlede</strong> fordi du forsøgte at slette punkt "
+"{0}, som stadig er i brug i vej {1}.<br><br>Klik <strong>{2}</strong> for at "
+"downloade alle punkt {0}'s forældre veje.<br>Om nødvendigt vil JOSM oprette "
+"konflikter, som du kan løse i konfliktløsningsdialogen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
 msgid "Node still in use"
-msgstr ""
+msgstr "Punkter stadig i brug"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275
@@ -8457,4 +8733,5 @@
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
+"Advarsel: Fejloverskrift \"{0}\" matchede ikke med et forventet mønster"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46
@@ -8464,17 +8741,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
 msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+msgstr "Indtast en kommentar til sendingen [min. 3 tegn)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "Rettesæts-ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "Oprettet ved:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "Rettesætskommentar:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -8484,54 +8761,54 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "Send til et nyt rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
+msgstr "Åbn et nyt rettesæt og brug det i den næste sending"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "Send til et eksisterende rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Send data til et allerede eksisterende og åbent rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Luk rettesæt efter sending"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143
 msgid "Select to close the changeset after the next upload"
-msgstr ""
+msgstr "Markér for at lukke rettesættet efter den næste sending"
 
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Hent listen med dine åbne rettesæt fra serveren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Luk det nu markerede åbne rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>Marker venligst de rettesæt du ønsker at lukke</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
-msgstr ""
+msgstr "Åbn rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
 msgid "Close changesets"
-msgstr ""
+msgstr "Luk rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Luk de markerede åbne rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Annuller lukning af rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
@@ -8542,5 +8819,5 @@
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Lukker rettesæt {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
@@ -8560,13 +8837,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
 msgid "Save user and password (unencrypted)"
-msgstr "Gem brugernavn og kodeord (ukrypteret)"
+msgstr "Gem brugernavn og adgangskode (ukrypteret)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
 msgid "Please enter the user name of your OSM account"
-msgstr ""
+msgstr "Indtast venligst din OSM-kontos brugernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
 msgid "Please enter the password name of your OSM account"
-msgstr ""
+msgstr "Indtast venligst din OSM-kontos adgangskode"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
@@ -8579,5 +8856,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
 msgid "Warning: The password is transferred unencrypted."
-msgstr "Advarsel: Kodeordet sendes ukrypteret."
+msgstr "Advarsel: Adgangskoden sendes ukrypteret."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254
@@ -8587,5 +8864,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255
 msgid "Please enter the password for authenticating at your proxy server"
-msgstr ""
+msgstr "Indtast venligst adgangskoden til godkendelse af din proxy-server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
@@ -8595,4 +8872,6 @@
 "username and a valid password.</html>"
 msgstr ""
+"<html>Godkendelse af HTTP proxyen ''{0}'' mislykkedes. Indtast venligst et "
+"gyldigt brugernavn og en gyldig adgangskode.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
@@ -8601,45 +8880,47 @@
 "the password may be transferred unencrypted.</html>"
 msgstr ""
+"<html>Advarsel: Afhængigt af godkendelsesmetoden proxy-serveren bruger, kan "
+"kodeordet blive overført ukrypteret.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
 msgid "Authenticate"
-msgstr ""
+msgstr "Godkend"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Få godkendelse med den givne brugernavn og adgangskode"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
 msgid "Cancel authentication"
-msgstr ""
+msgstr "Annullér godkendelse"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924
 msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Start en filvælger for at markere en fil"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Select filename"
-msgstr ""
+msgstr "Vælg filnavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 msgid "No"
-msgstr ""
+msgstr "Nej"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr ""
+msgstr "Lag \"{0}\" har ændringer som bør sendes til serveren."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "Lag \"{0}\" har ikke nogen ændringer at sende."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
@@ -8649,27 +8930,28 @@
 "''{1}''."
 msgstr ""
+"Lag \"{0}\" har ændringer som bør gemmes i dets tilhørende fil ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Lag \"{0}\" har ingen ændringer at gemme."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Ingen fil hører til dette lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
 msgid "Please select a file"
-msgstr ""
+msgstr "Vælg venligst en fil"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "Lag \"{0}\" er ikke bakket op af en fil"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr ""
+msgstr "Fil \"{0}\" er ikke skrivbar. Indtast venligst et andet filnavn."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -8677,22 +8959,22 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Markér for at sende lag \"{0}\" til serveren ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
+msgstr "Gemmer lag i ''{0}'' ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
+msgstr "Ugemte ændringer - Gem/Send før afslutning?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Ugemte ændringer - Gem/Send før sletning?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
 msgid "Uploading and saving modified layers ..."
-msgstr ""
+msgstr "Sender og gemmer ændrede lag ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
@@ -8705,9 +8987,13 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
+"<html>{0} lag har uløste konflikter.<br>Løs dem enten først eller kassér "
+"ændringerne.<br>Lag med konflikter:</html>"
 msgstr[1] ""
+"<html>{0} lag har uløste konflikter.<br>Løs dem enten først eller kassér "
+"ændringerne.<br>Lag med konflikter:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
 msgid "Unsaved data and conflicts"
-msgstr ""
+msgstr "Ugemte data og konflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
@@ -8725,5 +9011,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
 msgid "Unsaved data and missing associated file"
-msgstr ""
+msgstr "Ugemte data og manglende tilknyttet fil"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
@@ -8742,9 +9028,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
 msgid "Unsaved data non-writable files"
-msgstr ""
+msgstr "Ugemte data, ikke-skrivbare filer"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
 msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
+msgstr "Luk denne dialog og genoptag redigering i JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
@@ -8754,34 +9040,34 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
 msgid "Exit JOSM without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Afslut JOSM uden at gemme. Ugemte ændringer går tabt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Discard and Delete"
-msgstr ""
+msgstr "Kassér og Slet"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Slet lag uden at gemme. Ugemte ændringer går tabt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save/Upload and Exit"
-msgstr ""
+msgstr "Gem/Send og Afslut"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr ""
+msgstr "Afslut JOSM og gem. Ugemte ændringer sendes og/eller gemmes."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload and Delete"
-msgstr ""
+msgstr "Gem/Send og Slet"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
-msgstr ""
+msgstr "Gem/Send lag før sletning. Ugemte ændringer går ikke tabt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
+msgstr "Gør lag ''{0}'' klar til afsending"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
@@ -8859,10 +9145,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
 msgid "Filename"
-msgstr ""
+msgstr "Filnavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:465
 msgid "Upload"
-msgstr ""
+msgstr "Upload"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55
@@ -8872,17 +9158,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106
 msgid "Initializing nodes to update ..."
-msgstr ""
+msgstr "Initialiserer punkter at opdatere ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122
 msgid "Initializing ways to update ..."
-msgstr ""
+msgstr "Initialiserer veje at opdatere ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131
 msgid "Initializing relations to update ..."
-msgstr ""
+msgstr "Initialiserer relationer at opdatere ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:116
 msgid "Settings"
-msgstr ""
+msgstr "Indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117
@@ -8905,5 +9191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Konfigurér avancerede indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:170
@@ -8911,5 +9197,5 @@
 #, java-format
 msgid "Upload to ''{0}''"
-msgstr ""
+msgstr "Upload til ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:358
@@ -8919,30 +9205,30 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Send de ændrede primitiver"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
+msgstr "Indtast en kommentar for dette rettesæt før det sendes (min 3 tegn)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:367
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "Ulovlig kommentar for sending"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:376
 msgid "Please enter a valid chunk size first"
-msgstr ""
+msgstr "Indtast venligst først en gyldig størrelse for bidderne"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377
 msgid "Illegal chunk size"
-msgstr ""
+msgstr "Ulovlig størrelse af bidder"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
 msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "Annullér sendingen og genoptag redigeringen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453
 #, java-format
 msgid "Tags of changeset {0}"
-msgstr ""
+msgstr "Tags i rettesæt {0}"
 
 #. we tried to delete an already deleted primitive.
@@ -8954,12 +9240,14 @@
 "primitive and retrying to upload."
 msgstr ""
+"Advarsel: Primitiv  ''{0}'' er allerede slettet fra serveren. Skipper denne "
+"primitiv og prøver igen at sende"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Gør primitiver klar til at sende ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr ""
+msgstr "Objekter sendes til  et <strong>nyt rettesæt</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -8969,12 +9257,16 @@
 "comment ''{1}''."
 msgstr ""
+"Objekter sendes til det <strong>åbne rettesæt</strong> {0} med kommentaren "
+"''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
+"Rettesættet vil blive lukket <strong>lukket</strong> efter denne sending"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56
 msgid "The changeset is <strong>left open</strong> after this upload"
 msgstr ""
+"Rettesættet vil blive strong>efterladt åben</strong> efter denne sending"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
@@ -9026,30 +9318,30 @@
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr ""
+msgstr "Sender data for lag ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
 msgid "Continue uploading"
-msgstr ""
+msgstr "Fortsætter uploading"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82
 msgid "Click to continue uploading to additional new changesets"
-msgstr ""
+msgstr "Klik for at fortsætte sending til yderligere nye rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86
 msgid "Go back to Upload Dialog"
-msgstr ""
+msgstr "Gå tilbage til upload dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
 msgid "Click to return to the Upload Dialog"
-msgstr ""
+msgstr "Klik for at gå tilbage til sendedialogen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
 msgid "Abort"
-msgstr ""
+msgstr "Afbryd"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
 msgid "Click to abort uploading"
-msgstr ""
+msgstr "Klik for at afbryde uploading"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99
@@ -9063,8 +9355,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
-msgstr[0] ""
-msgstr[1] ""
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
+msgstr[0] "Der er {0} objekt tilbage at uploaded."
+msgstr[1] "Der er {0} objekter tilbage at uploaded."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112
@@ -9079,5 +9371,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
 msgid "Changeset is full"
-msgstr ""
+msgstr "Rettesættet er fyldt"
 
 #. we tried to delete an already deleted primitive.
@@ -9098,5 +9390,5 @@
 #, java-format
 msgid "Uploading {0} objects ..."
-msgstr ""
+msgstr "Uploader {0} objekter ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
@@ -9119,9 +9411,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Vælg objekter til upload"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Afbryd uploading"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
@@ -9148,9 +9440,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9174,7 +9465,14 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
 msgid "(1 request)"
-msgstr ""
+msgstr "(1 anmodning)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353
@@ -9183,5 +9481,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362
 msgid "(# requests unknown)"
-msgstr ""
+msgstr "(# anmodninger ukendt)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357
@@ -9190,6 +9488,6 @@
 msgid "({0} request)"
 msgid_plural "({0} requests)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0} anmodning)"
+msgstr[1] "({0} anmodninger)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
@@ -9228,6 +9526,6 @@
 msgid "{0} object to add:"
 msgid_plural "{0} objects to add:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekt at tilføje:"
+msgstr[1] "{0} objekter at tilføje:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104
@@ -9235,6 +9533,6 @@
 msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekt at ændre:"
+msgstr[1] "{0} objekter at ændre:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
@@ -9242,6 +9540,6 @@
 msgid "{0} object to delete:"
 msgid_plural "{0} objects to delete:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekt at slette:"
+msgstr[1] "{0} objekter at slette:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
@@ -9320,5 +9618,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313
 msgid "Import not possible"
-msgstr ""
+msgstr "Import er ikke mulig"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
@@ -9359,6 +9657,6 @@
 msgid "{0} track"
 msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} spor"
+msgstr[1] "{0} spor"
 
 #. item "Relations/Route" text "Symbol description"
@@ -9375,5 +9673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
 msgid "Length"
-msgstr ""
+msgstr "Længde"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:433
@@ -9494,6 +9792,6 @@
 msgid "There was {0} conflict detected."
 msgid_plural "There were {0} conflicts detected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Der blev opdaget {0} conflikt"
+msgstr[1] "Der blev opdaget {0} conflikter"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
@@ -9530,6 +9828,6 @@
 msgid "{0} deleted"
 msgid_plural "{0} deleted"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} slettet"
+msgstr[1] "{0} slettet"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
@@ -9540,5 +9838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
-msgstr ""
+msgstr "nulstil"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
@@ -9558,9 +9856,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
 msgid "No problems found"
-msgstr ""
+msgstr "Fandt ingen problemer"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
 msgid "Following problems found:"
-msgstr ""
+msgstr "Følgende problemer blev fundet:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
@@ -9574,6 +9872,6 @@
 msgid "track"
 msgid_plural "tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "spor"
+msgstr[1] "spor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
@@ -9604,24 +9902,24 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-filer (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Filen {0} er hentet, dog under navnet \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fejl ved indlæsning {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kunne ikke læse \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9633,34 +9931,34 @@
 "vælg en tidszone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-tidspunkt (aflæst fra ovenstående foto): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/åååå tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Jeg er i tidszonen: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Ingen dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Åbn et andet foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkronisér tiden fra et billede på GPS-modtageren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9670,114 +9968,116 @@
 "Brug venligst det angivne format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Intet GPX-spor er indlæst endnu>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Åben endnu en GPX-sporing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Automatisk gæt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgstr "Manuel justering"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Tidszone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Forskydning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+msgstr "Ingen gpx valgt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Tilpas billeder med GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Sammenhold"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Ugyldig tidszone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Ugyldig forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+msgstr "Prøv igen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9785,38 +10085,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Justér tidszone og forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Det valgte billede rummer ingen tidsangivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Billederne rummer ingen tidsangivelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX-sporet har ingen tidsangivelser."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Du bør vælge et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Intet valgt GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9827,5 +10127,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9836,56 +10136,56 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Trækker GPS-lokaliteter ud fra EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Indlæs billeder..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Indlæser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tjekker mappen {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fandt en null-fil i mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fejl ved hentning af filer fra mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9893,22 +10193,22 @@
 msgstr[1] "billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} blev fundet, som skal gps-tagges"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9940,5 +10240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr ""
+msgstr "Vis foregående billed"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -9948,5 +10248,5 @@
 #, java-format
 msgid "Geoimage: {0}"
-msgstr ""
+msgstr "Geoimage: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
@@ -9956,5 +10256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 msgid "Delete File from disk"
-msgstr ""
+msgstr "Slet fil fra disk"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
@@ -9965,5 +10265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
 msgid "Show next Image"
-msgstr ""
+msgstr "Vis næste billed"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
@@ -10060,5 +10360,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Toggle visible state of the marker text and icons."
-msgstr "Skift synligheden for markør-tekst og -ikoner"
+msgstr "Slå synlighed af markørtekst og -ikoner til/fra"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
@@ -10076,5 +10376,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 msgid "Unable to create new audio marker."
-msgstr "Kan ikke sætte ny audio-markør"
+msgstr "Kan ikke oprette ny lydmarkør"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
@@ -10097,4 +10397,585 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Brug globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Forfattere"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Klik for at afbryde sammenlægning af punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Bruger navn: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Adgangskode:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Roter med uret"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Tilføj egenskaber"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Forfattere"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Indtast venligst et brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Indtast venligst din OSM-kontos brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Opstart af API'et fejlede"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Adgang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Udvidede indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Indtast søgeudtrykket"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Indtast venligst et brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Indtast venligst et brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Klik for at afbryde den aktuelle operation"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Vælg mindst ét punkt eller vej."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Intet resultat for \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Luk dialog og annuller download"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Luk dialogen og opret et nyt punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Advarsel: Kunne ikke gemme indstillinger i \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#, fuzzy
+msgid "Initializing a session at the OSM website..."
+msgstr "Initialiserer relationer at opdatere ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Gemmer lag i ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Upload indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Tårn reference"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Anmod om opdatering"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr "<html>Version <strong>{0}</strong> nu redigeret i lag ''{1}''</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+#, fuzzy
+msgid "Go back to step 1/3"
+msgstr "Gå tilbage til upload dialog"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Klik for at fjerne destination"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Klik for at fjerne destination"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Adgang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Opdateringen fejlede"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "tekststreng;tekststreng;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10129,5 +11010,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10135,5 +11016,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10141,7 +11022,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Vælg venligst rækken, der skal slettes"
@@ -10165,5 +11046,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
 msgid "Create non-audio markers when reading GPX."
-msgstr "Opret ikke-lydmarkører, når GPX-data læses."
+msgstr ""
+"Opret markører der ikke har noget med lyd at gøre, når der læses GPX-data."
 
 #. various methods of making markers on import audio
@@ -10225,4 +11107,6 @@
 "waypoints) with names or descriptions."
 msgstr ""
+"Opret automatisk lydmarkører udfra trackpoints (fremfor explicitte "
+"waypoints) med navne eller beskrivelser."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
@@ -10231,4 +11115,6 @@
 "modified time of each audio WAV file imported."
 msgstr ""
+"Opret lydmarkører ved positionen på sporet svarende til den modificerede tid "
+"af hver lyd-WAV-fil importeret."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
@@ -10585,12 +11471,4 @@
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Behold backup-filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Gem backup-filer med ~ i slutningen af filnavnet, når der gemmes"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10629,17 +11507,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Udseende"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Sprog"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Standard (automatisk valgt)"
@@ -10656,5 +11529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
 msgid "Used style"
-msgstr ""
+msgstr "Brug stil"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
@@ -10687,5 +11560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
-msgstr ""
+msgstr "Indtast URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
@@ -10706,10 +11579,20 @@
 msgstr "Indstil udvidelses-sites"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Luk dialogen og opret et nyt punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Fortryd opdateringerne og luk dialogboksen"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Indstillinger for visning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10719,29 +11602,29 @@
 "prorammet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Indstillinger for forbindelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Indstillinger for forbindelse til OSM-serveren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Indstillinger for kort"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Indstilinger for projicering af kort og datafortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Lydindstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Indstillinger for lydafspiller og lydmarkører"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft."
@@ -10768,88 +11651,28 @@
 msgstr "Projiceringen {0} kunne ikke aktiveres. Benytter Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Godkend"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxy-indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Basis URLen for OSM serveren (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Login-navn (e-mail) til OSM-kontoen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Login-kodeord til OSM-kontoen. Efterlad blank for ikke at gemme noget "
-"kodeord."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Grundlæggende URL til server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM-brugernavn (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM-kodeord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -10898,20 +11721,20 @@
 #, java-format
 msgid "URL: {0}"
-msgstr ""
+msgstr "URL: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409
 #, java-format
 msgid "Author: {0}"
-msgstr ""
+msgstr "Forfatter: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Webpage: {0}"
-msgstr ""
+msgstr "Hjemme: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Version: {0}"
-msgstr ""
+msgstr "Version: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
@@ -10968,9 +11791,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
-msgstr ""
+msgstr "Sorter fordefineredes menu"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
-msgstr ""
+msgstr "Fordefinerede tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:183
@@ -11133,4 +11956,261 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Ugyldig URL?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Forbindelsen mislykkedes."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+#, fuzzy
+msgid "Use Basic Authentication"
+msgstr "Annullér godkendelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+#, fuzzy
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr "Få godkendelse med den givne brugernavn og adgangskode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Brug standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, fuzzy, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+"Advarsel: Uventet værdi for indstilling ''{0}''. Fik ''{1}''. Nulstiller til "
+"standard forespørgsel."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Behold backup-filer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Gem backup-filer med ~ i slutningen af filnavnet, når der gemmes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM-brugernavn (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM-adgangskode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>Advarsel: Adgangskoden er gemt i klartekst i indstillingsfilen."
+"<br>Adgangskoden bliver overført i klartekst til serveren, kodet i URL'en."
+"<br><b>Brug ikke en værdifuld adgangskode.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Grundlæggende URL til server"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Validér"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+#, fuzzy
+msgid "The API URL is valid."
+msgstr "Denne rettesætsforespørgselsURL er ugyldig"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Nuværende værdi er standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Genstart venligst JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr "Vært:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr "Port:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+"Indtast venligst et brugernavn og en adgangskode hvis din proxy kræver "
+"godkendelse."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr "Ingen proxy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11180,5 +12260,5 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "Kunne ikke læse den forudindstillede kilde til tagging: {0}"
+msgstr "Kunne ikke læse kilde til fordefinerede tags: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
@@ -11211,5 +12291,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 msgid "Apply Preset"
-msgstr "Anvend Preset"
+msgstr "Anvend fordefinition"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
@@ -11220,10 +12300,10 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr ""
+msgstr "Fordefinitionsgruppe {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr ""
+msgstr "Fordefinitionsgruppe {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -11274,5 +12354,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11318,4 +12398,6 @@
 "and ''display_name''"
 msgstr ""
+"Kan ikke oprette en rettesæts-forespørgsel, der inkluderer begge "
+"forespørgsels-parametrene \"uid\" og \"display_name\""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
@@ -11324,23 +12406,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr "Proxy vil ikke blive brugt."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11349,16 +12437,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11366,5 +12454,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11372,5 +12460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11391,19 +12479,19 @@
 #, java-format
 msgid "Could not export ''{0}''."
-msgstr ""
+msgstr "Kunne ikke eksportere ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:38
 #, java-format
 msgid "Could not import ''{0}''."
-msgstr ""
+msgstr "Kunne ikke importere ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:45
 msgid "Could not import files."
-msgstr ""
+msgstr "Kunne ikke importere filer."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:73
 #, java-format
 msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-msgstr ""
+msgstr "<html>Kunne ikke læse filer.<br> Fejl er: <br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39
@@ -11485,10 +12573,10 @@
 #, java-format
 msgid "File \"{0}\" does not exist"
-msgstr ""
+msgstr "Fil \"{0}\" findes ikke"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:76
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Indsættelse af fil \"{0}\" fejlede"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
@@ -11503,9 +12591,9 @@
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
 msgid "Image Files"
-msgstr ""
+msgstr "Billedfiler"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:20
 msgid "folder"
-msgstr ""
+msgstr "mappe"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -11568,6 +12656,6 @@
 msgid "Downloading {0} object from ''{1}''"
 msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Downloader {0} objekt fra ''{1}''"
+msgstr[1] "Downloader {0} objekter fra ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -11606,5 +12694,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11648,5 +12736,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11679,9 +12767,9 @@
 #, java-format
 msgid "Uploading {0} objects..."
-msgstr ""
+msgstr "Uploader {0} objekter..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Venter 10 sekunder ... "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
@@ -11692,32 +12780,32 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455
 msgid "OK - trying again."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+msgstr "OK - prøv igen"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+msgstr "(Kode={0})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11796,5 +12884,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
 msgid "<anonymous>"
-msgstr ""
+msgstr "<anonym>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:202
@@ -11818,4 +12906,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Ulovlig dokument struktur. Fandt punkt, vej eller relation udenfor \"create"
+"\", \"modify\" eller \"delete\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -11859,5 +12949,5 @@
 #, java-format
 msgid "Unsupported version: {0}"
-msgstr ""
+msgstr "Ikke understøttet version: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
@@ -11875,4 +12965,21 @@
 msgid "Parsing list of changesets..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Advarsel: Uventet værdi for indstilling ''{0}''. Fik ''{1}''. Nulstiller til "
+"standard forespørgsel."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
@@ -11921,5 +13028,5 @@
 #, java-format
 msgid "File ''{0}'' does not exist."
-msgstr ""
+msgstr "Fil ''{0}'' findes ikke."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110
@@ -12012,5 +13119,5 @@
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
-msgstr ""
+msgstr "Ukendt eller ikke understøttet API version. Fik {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
@@ -12081,5 +13188,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598
 msgid "Preparing data set..."
-msgstr ""
+msgstr "Forbereder data sæt..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
@@ -12090,5 +13197,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Downloader fra OSM server..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
@@ -12162,5 +13269,5 @@
 #, java-format
 msgid "Failed to open connection to API {0}."
-msgstr ""
+msgstr "Fejlede ved åbning at forbindelse af API {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86
@@ -12170,23 +13277,28 @@
 "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Indlæser {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12229,5 +13341,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Uploader data ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
@@ -12265,5 +13377,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
 msgid "Please restart JOSM."
-msgstr ""
+msgstr "Genstart venligst JOSM."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
@@ -12284,5 +13396,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166
 msgid "Skip download"
-msgstr ""
+msgstr "Afbyd download"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167
@@ -12292,5 +13404,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167
 msgid "Skip Download"
-msgstr ""
+msgstr "Afbryd download"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:169
@@ -12379,5 +13491,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 msgid "<html>"
-msgstr ""
+msgstr "<html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:316
@@ -12569,5 +13681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12576,5 +13688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12584,5 +13696,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12592,5 +13704,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html>Godkendelse af HTTP proxyen ''{0}'' mislykkedes. Indtast venligst et "
+"gyldigt brugernavn og en gyldig adgangskode.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12599,5 +13738,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12606,5 +13745,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12613,9 +13752,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12624,5 +13763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12632,5 +13771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12639,5 +13778,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12646,5 +13785,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12653,10 +13792,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12665,10 +13804,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+msgstr "<br>Fejl meddelelse (ikke oversat): {0}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12679,5 +13818,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12687,5 +13826,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12696,18 +13835,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12735,4 +13861,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -12814,5 +13946,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
-msgstr "Opret et vejgitter"
+msgstr "Opret net af veje"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -12821,4 +13953,6 @@
 "in common"
 msgstr ""
+"Opretter et net af veje i basen til to eksisterende, der har forskellige "
+"punkter og en tilfælles"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
@@ -12832,5 +13966,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
 msgid "Create a grid of ways"
-msgstr "Opret et gitter af veje"
+msgstr "Opret et net af veje"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
@@ -12872,5 +14006,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
@@ -12936,5 +14070,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387
 msgid "No password provided."
-msgstr "Intet kodeord er angivet."
+msgstr "Ingen adgangskode er angivet."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
@@ -12973,9 +14107,9 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Alphabetic"
-msgstr ""
+msgstr "Alfabetisk"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Numeric"
-msgstr ""
+msgstr "Numerisk"
 
 #. NOTE: The following 2 arrays must match in number of elements and position
@@ -12983,18 +14117,18 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Actual"
-msgstr ""
+msgstr "Faktisk"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Estimate"
-msgstr ""
+msgstr "Skøn"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Potential"
-msgstr ""
+msgstr "Potentiel"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
 #, java-format
 msgid "Relation: {0}"
-msgstr ""
+msgstr "Relation: {0}"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202
@@ -13008,21 +14142,21 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
 msgid "Increment:"
-msgstr ""
+msgstr "Forøgelse:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
 msgid "Starting #:"
-msgstr ""
+msgstr "Start #:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221
 msgid "Ending #:"
-msgstr ""
+msgstr "Slut #:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
 msgid "Accuracy:"
-msgstr ""
+msgstr "Præcision:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
 msgid "Convert way to individual house numbers."
-msgstr ""
+msgstr "Omdan vej til individuelle husnumre:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
@@ -13033,25 +14167,25 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
 msgid "City:"
-msgstr ""
+msgstr "By:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
 msgid "State:"
-msgstr ""
+msgstr "Stat:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
 msgid "Post Code:"
-msgstr ""
+msgstr "Postnummer:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
 msgid "Country:"
-msgstr ""
+msgstr "Land:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
 msgid "Full Address:"
-msgstr ""
+msgstr "Fuldstændig adresse:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
 msgid "Optional Information:"
-msgstr ""
+msgstr "Valgfri information:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
@@ -13065,45 +14199,45 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
 msgid "Expected odd numbers for addresses"
-msgstr ""
+msgstr "Forventede ulige numre for adresser"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
 msgid "Expected even numbers for addresses"
-msgstr ""
+msgstr "Forventede lige numre for adresser"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
 msgid "Expected valid number for address increment"
-msgstr ""
+msgstr "Forventede gyldige numre for adresser i stigende orden"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 msgid "Country code must be 2 letters"
-msgstr ""
+msgstr "Landekode skal være på 2 bogstaver"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
 msgid "Please enter valid number for starting and ending address"
-msgstr ""
+msgstr "Angiv venligst et gyldigt nummer for start og slut vedr adresse"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
 msgid "Alphabetic address must end with a letter"
-msgstr ""
+msgstr "Alfabetisk adresse skal ende med et bogstav"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
+msgstr "Start og slutnumre skal være for den samme alfabetiske adresse"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
 msgid "Starting address letter must be less than ending address letter"
-msgstr ""
+msgstr "Start adressebogstav skal være lavere end slut adressebogstav"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
 msgid "Please enter valid number for starting address"
-msgstr ""
+msgstr "Indtast venligst et gyldigt nummer for start adresse"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
 msgid "Please enter valid number for ending address"
-msgstr ""
+msgstr "Indtast venligst et gyldigt nummer for slut adresse"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Starting address number must be less than ending address number"
-msgstr ""
+msgstr "Start adressenummer skal være lavere end slut adressenummer"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
@@ -13119,7 +14253,7 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
-msgstr ""
+msgstr "Vælg Feuille"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:149
@@ -13128,4 +14262,6 @@
 "Probably an old version of the cache file."
 msgstr ""
+"fejl ved indlæsning af mellemlagerfil.\n"
+"Sandsynligvis en ældre version af mellemlagerfil."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
@@ -13135,5 +14271,5 @@
 #, java-format
 msgid "Lambert Zone {0} cache file (.{0})"
-msgstr ""
+msgstr "Lambert Zone {0} mellemlagerfil (.{0})"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
@@ -13148,17 +14284,17 @@
 #, java-format
 msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
-msgstr ""
+msgstr "Lambert CC9 Zone {0} mellemlagerfil (.CC{0})"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
 msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
-msgstr ""
+msgstr "Guadeloupe Fort-Marigot mellemlagerfil (.UTM1)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
 msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
-msgstr ""
+msgstr "Guadeloupe Ste-Anne mellemlagerfil (.UTM2)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
 msgid "Martinique Fort Desaix cache file (.UTM3)"
-msgstr ""
+msgstr "Martinique Fort Desaix mellemlagerfil (.UTM3)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
@@ -13166,7 +14302,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166
 msgid "CadastreGrabber: Illegal url."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+msgstr "CadastreGrabber: Ugyldig URL."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13175,25 +14317,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Vælg fra..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Vælg fra..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+msgstr "Vælg kommune"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+msgstr "Cadastre"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+msgstr "Autokilde"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13202,13 +14342,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+msgstr "JOSM er stoppet for at ændring skal have effekt."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13216,34 +14356,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+msgstr "Erstat den originale baggrund med JOSM's baggrundsfarver."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+msgstr "Gør baggrund gennemsigtig"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+msgstr "Tegn grænser for downloadede data."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Tilvælg automatisk caching."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Maks. cachestørrelse (i MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13255,18 +14395,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+msgstr "Fransk Cadastre-WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Kilde"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13276,5 +14416,5 @@
 "defineret i JOSM-indstillingerne."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13282,44 +14422,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+msgstr "Hent mindre billeder (højere kvalitet men kræver mere hukommelse)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Fast størrelse (fra 25 til 1.000 meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13370,5 +14510,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
-msgstr ""
+msgstr "Opret grænse"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
@@ -13378,5 +14518,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
-msgstr ""
+msgstr "Billed allerede indlæst"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
@@ -13388,5 +14528,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
-msgstr ""
+msgstr "Udtræk kommunegrænser"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -13402,10 +14542,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 msgid "Download Image from French Cadastre WMS"
-msgstr ""
+msgstr "Download billeder fra Fransk Cadastre WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 #, java-format
 msgid "Cadastre: {0}"
-msgstr ""
+msgstr "Cadastre: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
@@ -13431,5 +14571,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13437,14 +14577,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13452,14 +14592,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13467,21 +14607,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+msgstr "Øst"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+msgstr "Nord"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13495,5 +14635,5 @@
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
+msgstr "{0} ikke tilladt med den nuværende visning"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
@@ -13529,5 +14669,5 @@
 #: build/trans_presets.java:2338
 msgid "Location"
-msgstr ""
+msgstr "Sted"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
@@ -13543,5 +14683,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
-msgstr ""
+msgstr "Nulstil cookie"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
@@ -13551,5 +14691,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
-msgstr ""
+msgstr "PNG filer (*.png)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
@@ -13590,28 +14730,28 @@
 msgstr "Tomt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+msgstr "Raster størrelse: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13620,47 +14760,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+msgstr "Mellemlager format fejl"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
-msgstr ""
-
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+msgstr "Mellemlager Lambert Zone fejl"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Brug"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Vælg venligst et skema, du vil benytte"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Farveskema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Vælg venligst det skema, du vil slette"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Brug det valgte skema fra listen"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Brug de nuværende farver i et nyt farveskema."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Slet det valgte skema fra listen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Farveskemaer"
@@ -13669,5 +14809,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 msgid "Split area"
-msgstr ""
+msgstr "Opdel areal"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
@@ -13684,9 +14824,9 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS Filer (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
 msgid "Format errors: "
-msgstr ""
+msgstr "Formatfejl: "
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
@@ -13700,5 +14840,5 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66
 msgid "TCX Files (*.tcx)"
-msgstr ""
+msgstr "TCX Filer (*.tcx)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -13742,5 +14882,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86
 msgid "EditGpx"
-msgstr ""
+msgstr "RedigérGpx"
 
 #. TODO what is icon at the end?
@@ -13779,29 +14919,29 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
 msgid "A By Time"
-msgstr ""
+msgstr "A Efter tid"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
 msgid "A By Distance"
-msgstr ""
+msgstr "A Efter afstand"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
 msgid "B By Time"
-msgstr ""
+msgstr "B Efter tid"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
 msgid "B By Distance"
-msgstr ""
+msgstr "B Efter afstand"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
 msgid "C By Time"
-msgstr ""
+msgstr "C Efter tid"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
 msgid "C By Distance"
-msgstr ""
+msgstr "C Efter afstand"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
 msgid "Data Logging Format"
-msgstr ""
+msgstr "Format for datalogning"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
@@ -13815,5 +14955,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
 msgid "Unknown logFormat"
-msgstr ""
+msgstr "Ukendt log format"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
@@ -13822,6 +14962,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Opdater"
@@ -13898,9 +15038,9 @@
 #: ../plugins/grid/src/grid/GridLayer.java:192
 msgid "Grid origin location"
-msgstr ""
+msgstr "Netoprindelsessted"
 
 #: ../plugins/grid/src/grid/GridLayer.java:197
 msgid "Grid rotation"
-msgstr "Rotation for gitter"
+msgstr "Net rotation"
 
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -13910,13 +15050,13 @@
 #: ../plugins/grid/src/grid/GridLayer.java:200
 msgid "Grid layout"
-msgstr "Gitterlayout"
+msgstr "Netlayout"
 
 #: ../plugins/grid/src/grid/GridLayer.java:222
 msgid "Grid layer:"
-msgstr "Gitterlag:"
+msgstr "Netlag:"
 
 #: ../plugins/grid/src/grid/GridPlugin.java:27
 msgid "Add grid"
-msgstr "Tilføj gitter"
+msgstr "Tilføj net"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -13963,5 +15103,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 msgid "WayPoint Image"
-msgstr ""
+msgstr "WayPoint billed"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
@@ -14004,19 +15144,19 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
-msgstr ""
+msgstr "Lake Walker."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
-msgstr ""
+msgstr "Lake Walker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:113
 #, java-format
 msgid "Error creating cache directory: {0}"
-msgstr ""
+msgstr "Fejl ved oprettelse af mellemlager katalog: {0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146
 msgid "Tracing"
-msgstr ""
+msgstr "Sporer"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:148
@@ -14042,39 +15182,39 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
 msgid "Lakewalker trace"
-msgstr ""
+msgstr "Lakewalker spor"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr ""
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+msgstr "Der er opstået en ukendt fejl"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "øst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "nordøst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "nordvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "vest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "sydvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "syd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "sydøst"
@@ -14114,5 +15254,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14123,81 +15263,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "vand"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "kystlinje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maksimalt antal segmenter pr. vej"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Opløsning af Landsat-tern (pixels pr. grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Størrelse af Landsat-tern (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Tag veje som"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS-lag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Kilde tekst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antal segmenter tillladt for hver genereret vej. Standard er 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14205,5 +15345,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14211,5 +15351,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14217,50 +15357,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Opløsning af Landsat-tern, målt i pixels pr. grad. Standard er 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Størrelse af et Landsat-tern, målt i pixels. Standard er 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Marker veje som vand, kystlinje, land eller intet. Default er vand."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14294,5 +15434,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
 msgid "no name"
-msgstr ""
+msgstr "intet navn"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -14311,5 +15451,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
 msgid "Way Info"
-msgstr ""
+msgstr "Information om vej"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
@@ -14338,5 +15478,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72
 msgid "Center Once"
-msgstr ""
+msgstr "Centrér en gang"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
@@ -14359,9 +15499,9 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
 msgid "Measured values"
-msgstr ""
+msgstr "Målte værdier"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
 msgid "Open the measurement window."
-msgstr ""
+msgstr "Åben målevinduet"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
@@ -14379,9 +15519,9 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:84
 msgid "Selection Length"
-msgstr ""
+msgstr "Det valgtes længde"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
 msgid "Selection Area"
-msgstr ""
+msgstr "Det valgtes areal"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
@@ -14411,5 +15551,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 msgid "Michigan Left"
-msgstr ""
+msgstr "Michigan ventre"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
@@ -14444,9 +15584,9 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
-msgstr ""
+msgstr "Opret multipolygon"
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
-msgstr ""
+msgstr "Opret multipolygon."
 
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85
@@ -14460,9 +15600,9 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Du må vælge mindst 2 veje."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
-msgstr ""
+msgstr "OpenLayers"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
@@ -14470,7 +15610,7 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
-msgstr ""
+msgstr "Vis OpenStreet fejlspørgsmål"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:91
@@ -14480,8 +15620,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Openstreet fejl udvidelsesmodul bruger den gamle server på appspot.com."
+"<br>En ny server er tilgængelig hos schokokeks.org.<br>Ønsker du at skifte "
+"til den nye server? (Anbefales stærkt)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Skift til den nye openstreet fejl server?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -14493,5 +15636,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14506,14 +15648,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Åbn OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14523,22 +15673,32 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+#, fuzzy
+msgid "Queue"
+msgstr "Forespørgsel"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Tilføj en kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Indtast din kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Kommentar:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Markér som udført"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Vil du virkelig lukke?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14546,23 +15706,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Luk"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Ny fejlrapport"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Opret fejlrapport"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Beskriv problemet præcist"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Oprettet"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Indtast venligst et brugernavn"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Ukendt status for fejlrapport"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Åbn OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14584,10 +15772,10 @@
 msgstr "Ukendt filtype: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14597,5 +15785,5 @@
 "under indstillingerne."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
@@ -14603,39 +15791,39 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63
 msgid "PicLayer"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+msgstr "PicLayer"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "hent data fra API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+msgstr "Opret nye objekter"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+msgstr "ændre dit valg"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "skift synsfeltet"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "bekræft alle Fjernbetjenings-handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Fjernbetjening"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Indstillinger for Fjernbetjeningsudvidelsen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14644,5 +15832,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Tilladte handlinger"
@@ -14671,5 +15859,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
+msgstr "Fjernstyring er blevet spurgt om at oprette et nyt punkt."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244
@@ -14680,13 +15868,13 @@
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 msgid "Edit relation"
-msgstr ""
+msgstr "Redigér relation"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
 msgid "Edit relations"
-msgstr ""
+msgstr "Redigér relationer"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:71
 msgid "No relation is selected"
-msgstr ""
+msgstr "Ingen relation er valgt"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:70
@@ -14756,25 +15944,25 @@
 msgstr "Fjern rute"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Indstillinger for Ruteplan-udvidelse"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Ret indstillinger for ruteplan"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Vej-type"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Hastighed (km/t)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Type"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Indtast vægtede værdier"
@@ -14782,9 +15970,9 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
-msgstr ""
+msgstr "Glidende kort"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
 msgid "Auto Zoom"
-msgstr ""
+msgstr "Auto zoom"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
@@ -14818,44 +16006,44 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
 msgid "image "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+msgstr "billed "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+msgstr "Glidende mappe"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Kilder til tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Autozoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Hent tern automatisk: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Maks. zoomniveau: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Nedton baggrund: "
@@ -14868,5 +16056,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 msgid "Save captured data to file every minute."
-msgstr ""
+msgstr "Gem indfangede data på fil hvert minut."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
@@ -14887,24 +16075,24 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr "SurveyorPlugin har brug for LiveGpsPlugin, men kunne ikke finde den."
+msgstr "Landmålermodul har brug for LiveGpsmodul, men kunne ikke finde den."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr ""
+msgstr "Landmåler..."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
-msgstr ""
+msgstr "Åben landmåler værktøj."
 
 #. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
-msgstr ""
+msgstr "Landmåler"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr ""
+msgstr "Kunne ikke læse landmåler definition: {0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
@@ -14921,10 +16109,10 @@
 #, java-format
 msgid "{0} start"
-msgstr ""
+msgstr "{0} start"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
 #, java-format
 msgid "{0} end"
-msgstr ""
+msgstr "{0} slut"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
@@ -14980,5 +16168,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "Fordefinitionstester"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
@@ -14986,12 +16174,16 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
+"Åbn testværktøjet for fordefinerede tags for forhåndsvisning af "
+"fordefinitions-dialoger"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
+"Du er nødt til at specificere kilder til fordefinerede tags i "
+"indstillingerne først."
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "Even/Odd"
-msgstr ""
+msgstr "Lige/ulige"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
@@ -15005,27 +16197,27 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
 msgid "Segments"
-msgstr ""
+msgstr "Segmenter"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
 msgid "Lowest housenumber cannot be higher than highest housenumber"
-msgstr ""
+msgstr "Laveste husnummer kan ikke være højere end højeste husnummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
 msgid "Housenumbers do not match odd/even setting"
-msgstr ""
+msgstr "Husnummer stemmer ikke med ulige/lige indstilling"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
 msgid "Segment must be a number greater 1"
-msgstr ""
+msgstr "Segmenter skal være ét nummer større"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
 #, java-format
 msgid "{0} must be greater than 0"
-msgstr ""
+msgstr "{0} skal være større end 0"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
 #, java-format
 msgid "{0} is not a number"
-msgstr ""
+msgstr "{0} er ikke et nummer"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
@@ -15075,5 +16267,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:167
 msgid "Grid"
-msgstr "Gitter"
+msgstr "Net"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
@@ -15087,37 +16279,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Brug ignorerings-listen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Brug ignorerings-listen til at undlade advarsler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Brug fejl-lag."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Brug fejl-laget til at vise problematiske elementer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+msgstr "Vis informationsniveau ved upload."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Ved behov"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Ved upload"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15126,5 +16318,5 @@
 "En OSM-datavalidator, som tjekker for typiske fejl af brugere og programmer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Data-validator"
@@ -15160,5 +16352,5 @@
 #, java-format
 msgid "Running test {0}"
-msgstr ""
+msgstr "Kører test {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
@@ -15173,14 +16365,14 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
 msgid "Validating"
-msgstr ""
+msgstr "Validerer"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
-msgstr ""
+msgstr "Test {0}/{1}: Starter {2}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
 msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Opdaterer fejl der er blevet set bort fra ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
@@ -15230,14 +16422,14 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:458
 msgid "Fixing errors ..."
-msgstr ""
+msgstr "Retter fejl..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:482
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Retter ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:499
 msgid "Updating map ..."
-msgstr ""
+msgstr "Opdaterer kort..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -15256,9 +16448,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 msgid "Unconnected coastline"
-msgstr ""
+msgstr "Uforbundne kystlinier"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
-msgstr ""
+msgstr "Uordnede kystlinier"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
@@ -15297,5 +16489,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
 msgid "Confirmation"
-msgstr ""
+msgstr "Bekræftelse"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
@@ -15488,18 +16680,18 @@
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr "Nøglen \"{0}\" er ikke kendt i forudindstillingerne"
+msgstr "Nøglen \"{0}\" er ikke fordefineret"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
 msgid "Presets do not contain property key"
-msgstr "Forudindstillingerne rummer ikke egenskabs-nøglen"
+msgstr "Fordefinitionerne indeholder ikke egenskabs-nøglen"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:542
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne"
+msgstr "Værdien \"{0}\" for nøglen \"{1}\" er ikke fordefineret"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
 msgid "Presets do not contain property value"
-msgstr "Værdien er ikke kendt i forudindstillingerne"
+msgstr "Fordefinitionerne indeholder ikke egenskabs-værdi"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:555
@@ -15560,4 +16752,5 @@
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
+"Godkend at egenskabs-værdier er gyldige tjeks i forhold til fordefinitioner."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
@@ -15639,5 +16832,5 @@
 #, java-format
 msgid "landuse type {0}"
-msgstr ""
+msgstr "Type af landanvendelse {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
@@ -15733,5 +16926,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "bygning"
@@ -15745,5 +16938,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "område"
@@ -15842,5 +17035,5 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
-msgstr ""
+msgstr "Skannet kort..."
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
@@ -15862,5 +17055,5 @@
 #, java-format
 msgid "Walking Papers: {0}"
-msgstr ""
+msgstr "Walking Papers: {0}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
@@ -15871,5 +17064,5 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr ""
+msgstr "Walking Papers"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:54
@@ -15934,5 +17127,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
 msgid "Not in cache"
-msgstr ""
+msgstr "Ikke i mellemlager"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -16045,5 +17238,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
 msgid "(deactivated)"
-msgstr ""
+msgstr "(deaktiveret)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:156
@@ -16068,9 +17261,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
 msgid "Yes, fetch images"
-msgstr ""
+msgstr "Ja hent billed"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "Invalid URL?"
-msgstr ""
+msgstr "Ugyldig URL?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
@@ -16116,5 +17309,5 @@
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
+msgstr "WMS fil version ikke understøttet; fundet {0}, forventet {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
@@ -16128,5 +17321,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
 msgid "Set WMS Bookmark"
-msgstr ""
+msgstr "Sæt WMS bogmærke"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
@@ -16138,62 +17331,62 @@
 msgstr "Åbn et tomt WMS-lag for at hente data fra en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Indstillinger for WMS-udvidelse"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Ret listen over WMS-servere, som vises i WMS-udvidelsesmenuen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Navn på menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Navn på menu (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+msgstr "Angiv et menumavn og en WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+msgstr "Vælg mindst en række at kopiere."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgstr "Downloader:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+msgstr "% af øst:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
-msgstr ""
+msgstr "% af nord:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "WMS Filer (*.wms)"
 
 #. *
@@ -16259,9 +17452,13 @@
 "true :-)"
 msgstr ""
+"Tillader brugeren at oprette forskellige farvesystemer og skifte mellem dem. "
+"Ændr blot farverne og opret et nyt system. Bruges til at skifte til en hvid "
+"baggrund med matchende farver for bedre synlighed i skarpt sollys. Se dialog "
+"i JOSM's indstillinger og 'Map Settings' (underligt men sandt :-)"
 
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
 msgid "Create a grid of ways."
-msgstr "Opret et gitter af veje"
+msgstr "Opret et net af veje."
 
 #. Plugin czechaddress
@@ -16312,5 +17509,5 @@
 #: build/trans_plugins.java:25
 msgid "Provide a background layer that displays a map grid"
-msgstr "Tilføj et baggrundslag, der viser et kort-gitter"
+msgstr "Stil et baggrundslag til rådighed, der viser et kortnet"
 
 #. Plugin ImageWayPoint
@@ -16342,4 +17539,7 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"Stil en opmålingsdialog og et lag til at måle længde og vinkel på segmenter "
+"til rådighed. Område omgivet af en simpel lukket vej og opret opmålingsstier "
+"(som også kan importeres fra et gps lag)."
 
 #. Plugin michigan_left
@@ -16354,4 +17554,6 @@
 "relation editor."
 msgstr ""
+"Opret multipolygoner med et klik. Meget nemmere end standardmåden med "
+"relationseditoren."
 
 #. Plugin nearclick
@@ -16422,4 +17624,6 @@
 "background and request updates."
 msgstr ""
+"Viser et \"slippy\" kortnet i JOSM. Kan hente fliser fra \"slippy\" kort, "
+"som baggrund og efterspørge opdateringer."
 
 #. Plugin surveyor
@@ -16431,5 +17635,5 @@
 #: build/trans_plugins.java:63
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr "Tilføjer en dialogboks for at rette tags i tabelform."
+msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed"
 
 #. Plugin tagging-preset-tester
@@ -16440,4 +17644,7 @@
 "the jar-file as standalone as well."
 msgstr ""
+"Tilføjer en tester af fordefinerede tags til hjælpemenuen, som hjælper dig "
+"med at udvikle fordefinerede tags (hurtig forhåndsvisning af dialogen der "
+"vil dukke op). Du kan også starte jar-filen som enkeltstående program."
 
 #. Plugin terracer
@@ -16533,5 +17740,5 @@
 #: build/trans_presets.java:68
 msgid "Highways"
-msgstr ""
+msgstr "Moterveje"
 
 #. group "Highways"
@@ -16897,5 +18104,5 @@
 #: build/trans_presets.java:159 build/trans_presets.java:175
 msgid "Motorroad"
-msgstr ""
+msgstr "Hovedlandeveje"
 
 #. item "Highways/Streets/Trunk" check "Embankment"
@@ -17219,5 +18426,5 @@
 #: build/trans_presets.java:1320
 msgid "grass_paver"
-msgstr ""
+msgstr "Græs_belægning"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
@@ -17262,5 +18469,5 @@
 #: build/trans_presets.java:258
 msgid "Living Street"
-msgstr ""
+msgstr "Beboelsesgade"
 
 #. item "Highways/Streets/Living Street"
@@ -17269,5 +18476,5 @@
 #: build/trans_presets.java:261
 msgid "Edit Living Street"
-msgstr ""
+msgstr "Redigér beboelsesgade"
 
 #. item "Highways/Streets/Living Street" text "Width (meters)"
@@ -17735,6 +18942,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorvej"
@@ -17760,6 +18967,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "motortrafikvej"
@@ -17785,6 +18992,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "primær"
@@ -17810,6 +19017,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "sekundær"
@@ -17823,5 +19030,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiær"
@@ -17839,5 +19046,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "beboelse"
@@ -17845,5 +19052,5 @@
 #: build/trans_presets.java:361
 msgid "living_street"
-msgstr ""
+msgstr "beboelses_gade"
 
 #. color street
@@ -17871,6 +19078,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "service"
@@ -17904,6 +19111,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "konstruktion"
@@ -17953,5 +19160,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -18330,5 +19537,5 @@
 #: build/trans_presets.java:1344
 msgid "traffic_signals"
-msgstr ""
+msgstr "trafik_lys"
 
 #: build/trans_presets.java:785 build/trans_presets.java:800
@@ -18340,5 +19547,5 @@
 #: build/trans_presets.java:1344
 msgid "unmarked"
-msgstr ""
+msgstr "uden markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
@@ -18346,5 +19553,5 @@
 #: build/trans_presets.java:1345
 msgid "Cross on horseback"
-msgstr ""
+msgstr "Overgangssted for ridende"
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
@@ -18353,5 +19560,5 @@
 #: build/trans_presets.java:1346
 msgid "Cross by bicycle"
-msgstr ""
+msgstr "Overkørsel for cykler"
 
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
@@ -18380,5 +19587,5 @@
 #: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "toucan"
-msgstr ""
+msgstr "toucan"
 
 #: build/trans_presets.java:789 build/trans_presets.java:804
@@ -18388,9 +19595,9 @@
 #: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "pegasus"
-msgstr ""
+msgstr "pegasus"
 
 #: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "tiger"
-msgstr ""
+msgstr "tiger"
 
 #. </optional>
@@ -18410,5 +19617,5 @@
 #: build/trans_presets.java:798
 msgid "Edit Crossing"
-msgstr ""
+msgstr "Redigér overkørsel"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
@@ -18586,5 +19793,5 @@
 #: build/trans_presets.java:873
 msgid "Cycle Barrier"
-msgstr ""
+msgstr "Cykelhindring"
 
 #. item "Barriers/Cycle Barrier"
@@ -18709,20 +19916,20 @@
 #: build/trans_presets.java:979
 msgid "Lift Gate"
-msgstr ""
+msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
 #: build/trans_presets.java:980
 msgid "Edit Lift Gate"
-msgstr ""
+msgstr "Redigér bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
 #: build/trans_presets.java:991
 msgid "Hampshire Gate"
-msgstr ""
+msgstr "Trådhegn"
 
 #. item "Barriers/Hampshire Gate"
 #: build/trans_presets.java:992
 msgid "Edit Hampshire Gate"
-msgstr ""
+msgstr "Redigér trådhegn"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
@@ -18865,5 +20072,5 @@
 #: build/trans_presets.java:1114
 msgid "Basin"
-msgstr ""
+msgstr "Bassin"
 
 #. item "Water/Water/Basin"
@@ -18937,5 +20144,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "marsk"
@@ -18943,5 +20150,5 @@
 #: build/trans_presets.java:1148
 msgid "reedbed"
-msgstr ""
+msgstr "marskland"
 
 #: build/trans_presets.java:1148
@@ -18951,9 +20158,9 @@
 #: build/trans_presets.java:1148
 msgid "tidalflat"
-msgstr ""
+msgstr "lavvandsområde"
 
 #: build/trans_presets.java:1148
 msgid "mangrove"
-msgstr ""
+msgstr "mangrove"
 
 #: build/trans_presets.java:1150
@@ -19026,5 +20233,5 @@
 #: build/trans_presets.java:1189
 msgid "Boatyard"
-msgstr ""
+msgstr "Værft"
 
 #. item "Water/Water/Boatyard"
@@ -19032,5 +20239,5 @@
 #: build/trans_presets.java:1191
 msgid "Edit Boatyard"
-msgstr ""
+msgstr "Redigér værft"
 
 #. item "Water/Water/Boatyard" text "Name"
@@ -19065,5 +20272,5 @@
 #: build/trans_presets.java:1213
 msgid "Lock Gate"
-msgstr ""
+msgstr "Sluseport"
 
 #. item "Waterway Point/Lock Gate"
@@ -19072,5 +20279,5 @@
 #: build/trans_presets.java:1217
 msgid "Weir"
-msgstr ""
+msgstr "Damlukke"
 
 #. item "Waterway Point/Weir"
@@ -19078,5 +20285,5 @@
 #: build/trans_presets.java:1219
 msgid "Edit Weir"
-msgstr ""
+msgstr "Redigér damlukke"
 
 #. item "Waterway Point/Weir" text "Name"
@@ -19145,5 +20352,5 @@
 #: build/trans_presets.java:1261
 msgid "Transport"
-msgstr ""
+msgstr "Transport"
 
 #. group "Transport"
@@ -19207,5 +20414,5 @@
 #: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "yard"
-msgstr ""
+msgstr "Banegård"
 
 #: build/trans_presets.java:1268 build/trans_presets.java:1274
@@ -19214,5 +20421,5 @@
 #: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "siding"
-msgstr ""
+msgstr "sidespor"
 
 #: build/trans_presets.java:1268 build/trans_presets.java:1274
@@ -19225,10 +20432,10 @@
 #: build/trans_presets.java:1270
 msgid "Narrow Gauge Rail"
-msgstr ""
+msgstr "Smalsporet bane"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
 #: build/trans_presets.java:1271
 msgid "Edit Narrow Gauge Rail"
-msgstr ""
+msgstr "Redigér smalsporet jernbane"
 
 #: build/trans_presets.java:1276
@@ -19324,5 +20531,5 @@
 #: build/trans_presets.java:1344
 msgid "Crossing type"
-msgstr ""
+msgstr "Type af overgangssted"
 
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
@@ -19573,5 +20780,5 @@
 #: build/trans_presets.java:2787
 msgid "24/7"
-msgstr ""
+msgstr "24/7"
 
 #: build/trans_presets.java:1397 build/trans_presets.java:1625
@@ -19603,5 +20810,5 @@
 #: build/trans_presets.java:2787
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
+msgstr "Mandag-Fredag 08:30-20:00"
 
 #: build/trans_presets.java:1397 build/trans_presets.java:1625
@@ -19665,5 +20872,5 @@
 #: build/trans_presets.java:2557
 msgid "Reference number"
-msgstr ""
+msgstr "Referensenummer"
 
 #. item "Car/Parking" combo "Type"
@@ -19679,9 +20886,9 @@
 #: build/trans_presets.java:1406 build/trans_presets.java:2338
 msgid "underground"
-msgstr ""
+msgstr "underjordisk"
 
 #: build/trans_presets.java:1407
 msgid "Park and Ride"
-msgstr ""
+msgstr "Parkér og kør"
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -19705,9 +20912,9 @@
 #: build/trans_presets.java:1412
 msgid "Spaces for Women"
-msgstr ""
+msgstr "Område for kvinder"
 
 #: build/trans_presets.java:1413
 msgid "Spaces for Parents"
-msgstr ""
+msgstr "Område for forældre"
 
 #: build/trans_presets.java:1414
@@ -19757,5 +20964,5 @@
 #: build/trans_presets.java:1438
 msgid "Edit Car Sharing"
-msgstr ""
+msgstr "Redigérer bildeling"
 
 #. item "Bicycle/Parking"
@@ -19786,5 +20993,5 @@
 msgctxt "railway"
 msgid "Station"
-msgstr ""
+msgstr "Station"
 
 #. item "Public Transport/Station"
@@ -19794,5 +21001,5 @@
 msgctxt "railway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Redigér station"
 
 #. item "Public Transport/Station" text "Name"
@@ -19906,5 +21113,5 @@
 #: build/trans_presets.java:2472
 msgid "Shelter"
-msgstr ""
+msgstr "Læskur"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
@@ -19965,5 +21172,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Rejse"
 
 #. group "Travel"
@@ -20050,10 +21257,10 @@
 #: build/trans_presets.java:1606
 msgid "Caravan Site"
-msgstr ""
+msgstr "Campingplads"
 
 #. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
-msgstr ""
+msgstr "Redigér campingplads"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
@@ -20126,5 +21333,5 @@
 #: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
-msgstr ""
+msgstr "regional"
 
 #: build/trans_presets.java:1624 build/trans_presets.java:1632
@@ -20334,7 +21541,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "gade"
@@ -20346,18 +21553,18 @@
 #: build/trans_presets.java:1725
 msgid "Shown Area"
-msgstr ""
+msgstr "Vis areal"
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1725
 msgid "site"
-msgstr ""
+msgstr "sted"
 
 #: build/trans_presets.java:1725
 msgid "city"
-msgstr ""
+msgstr "by"
 
 #: build/trans_presets.java:1725
 msgid "region"
-msgstr ""
+msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -20373,5 +21580,5 @@
 #: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Ruter vist for:"
 
 #. item "Tourism/Map" check "Hiking"
@@ -20386,5 +21593,5 @@
 #: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Mountain cykelkørsel"
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -20399,5 +21606,5 @@
 #: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
-msgstr ""
+msgstr "Ridning"
 
 #. item "Tourism/Map" check "Riding"
@@ -20436,15 +21643,15 @@
 #: build/trans_presets.java:1741
 msgid "plants"
-msgstr ""
+msgstr "planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1744
 msgid "Guidepost"
-msgstr ""
+msgstr "Guide post"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1759
 msgid "Information Terminal"
-msgstr ""
+msgstr "Informations terminal"
 
 #. item "Tourism/Information Terminal" text "Name"
@@ -20452,29 +21659,29 @@
 #: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
-msgstr ""
+msgstr "Nærmere beskrivelse"
 
 #: build/trans_presets.java:1769
 msgid "Audioguide"
-msgstr ""
+msgstr "Audio guide"
 
 #. <space />
 #: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Audio guide via mobiletelefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1780
 msgid "Phone number"
-msgstr ""
+msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
 #: build/trans_presets.java:1782
 msgid "Other Information Points"
-msgstr ""
+msgstr "Andre informations punkter"
 
 #. item "Tourism/Shelter"
 #: build/trans_presets.java:1790
 msgid "Edit Shelter"
-msgstr ""
+msgstr "Redigér læskur"
 
 #. item "Tourism/Shelter" text "Name"
@@ -20578,30 +21785,30 @@
 #: build/trans_presets.java:1848
 msgid "Wayside Cross"
-msgstr ""
+msgstr "Vejkryds"
 
 #. item "Historic Places/Wayside Cross"
 #: build/trans_presets.java:1849
 msgid "Edit Wayside Cross"
-msgstr ""
+msgstr "Redigér vejkryds"
 
 #. item "Historic Places/Wayside Cross" text "Name"
 #: build/trans_presets.java:1853
 msgid "Wayside Shrine"
-msgstr ""
+msgstr "Vejalter"
 
 #. item "Historic Places/Wayside Shrine"
 #: build/trans_presets.java:1854
 msgid "Edit Wayside Shrine"
-msgstr ""
+msgstr "Redigér vejalter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
 #: build/trans_presets.java:1858
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Grænsesten"
 
 #. item "Historic Places/Boundary Stone"
 #: build/trans_presets.java:1859
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Redigér grænsesten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -21062,28 +22269,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -21161,5 +22368,5 @@
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "cycling"
-msgstr ""
+msgstr "cykling"
 
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
@@ -21176,5 +22383,5 @@
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "football"
-msgstr ""
+msgstr "amerikansk fodbold"
 
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
@@ -21191,5 +22398,5 @@
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "hockey"
-msgstr ""
+msgstr "hockey"
 
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
@@ -21278,10 +22485,10 @@
 #: build/trans_presets.java:1912
 msgid "Racetrack"
-msgstr ""
+msgstr "Løbebane"
 
 #. item "Sports/Sport Facilities/Racetrack"
 #: build/trans_presets.java:1913
 msgid "Edit Racetrack"
-msgstr ""
+msgstr "Redigér løbebane"
 
 #: build/trans_presets.java:1921
@@ -21441,5 +22648,5 @@
 #: build/trans_presets.java:2137 build/trans_presets.java:2143
 msgid "sports_centre"
-msgstr ""
+msgstr "sportshal"
 
 #: build/trans_presets.java:1939 build/trans_presets.java:1945
@@ -21481,5 +22688,5 @@
 #: build/trans_presets.java:2137 build/trans_presets.java:2143
 msgid "track"
-msgstr ""
+msgstr "spor"
 
 #: build/trans_presets.java:1941
@@ -21521,10 +22728,10 @@
 #: build/trans_presets.java:1965
 msgid "Canoeing"
-msgstr ""
+msgstr "kano"
 
 #. item "Sport/Canoeing"
 #: build/trans_presets.java:1966
 msgid "Edit Canoeing"
-msgstr ""
+msgstr "Redigér kano"
 
 #. item "Sport/Cycling"
@@ -21614,14 +22821,14 @@
 #: build/trans_presets.java:2030
 msgid "Piste type"
-msgstr ""
+msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
 #: build/trans_presets.java:2030
 msgid "downhill"
-msgstr ""
+msgstr "styrtløb"
 
 #: build/trans_presets.java:2030
 msgid "nordic"
-msgstr ""
+msgstr "skiløb"
 
 #: build/trans_presets.java:2030
@@ -21975,5 +23182,5 @@
 #: build/trans_presets.java:2224
 msgid "College"
-msgstr ""
+msgstr "Videregående udd."
 
 #. item "Man-Made/Buildings/College"
@@ -21981,5 +23188,5 @@
 #: build/trans_presets.java:2226
 msgid "Edit College"
-msgstr ""
+msgstr "Redigér videregående udd."
 
 #. item "Man-Made/Buildings/College" text "Name"
@@ -22294,19 +23501,19 @@
 #: build/trans_presets.java:2303
 msgid "Tower type"
-msgstr ""
+msgstr "Type af tårn"
 
 #. item "Man Made/Tower" combo "Tower type"
 #: build/trans_presets.java:2303
 msgid "communication"
-msgstr ""
+msgstr "kommunikation"
 
 #: build/trans_presets.java:2303
 msgid "observation"
-msgstr ""
+msgstr "observation"
 
 #. <optional>
 #: build/trans_presets.java:2305
 msgid "Height (meters)"
-msgstr ""
+msgstr "Højde (meters)"
 
 #. item "Man Made/Tower" text "Operator"
@@ -22367,5 +23574,5 @@
 #: build/trans_presets.java:2337
 msgid "oil"
-msgstr ""
+msgstr "olie"
 
 #: build/trans_presets.java:2337 build/trans_presets.java:2379
@@ -22375,9 +23582,9 @@
 #: build/trans_presets.java:2337
 msgid "sewage"
-msgstr ""
+msgstr "affald"
 
 #: build/trans_presets.java:2337
 msgid "heat"
-msgstr ""
+msgstr "varme"
 
 #: build/trans_presets.java:2337
@@ -22387,9 +23594,9 @@
 #: build/trans_presets.java:2338
 msgid "underwater"
-msgstr ""
+msgstr "undervands"
 
 #: build/trans_presets.java:2338
 msgid "overground"
-msgstr ""
+msgstr "på land"
 
 #: build/trans_presets.java:2340
@@ -22430,5 +23637,5 @@
 #: build/trans_presets.java:2360
 msgid "Survey Point"
-msgstr ""
+msgstr "Målepunkt"
 
 #. item "Man Made/Survey Point"
@@ -22436,5 +23643,5 @@
 #: build/trans_presets.java:2362
 msgid "Edit Survey Point"
-msgstr ""
+msgstr "Redigér målepunkt"
 
 #. item "Man Made/Survey Point" text "Name"
@@ -22516,5 +23723,5 @@
 #: build/trans_presets.java:2397 build/trans_presets.java:2414
 msgid "Line reference"
-msgstr ""
+msgstr "Linie reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
@@ -22535,13 +23742,13 @@
 #: build/trans_presets.java:2405
 msgid "tower"
-msgstr ""
+msgstr "tårn"
 
 #: build/trans_presets.java:2405
 msgid "pole"
-msgstr ""
+msgstr "stang"
 
 #: build/trans_presets.java:2406
 msgid "Tower reference"
-msgstr ""
+msgstr "Tårn reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
@@ -22560,10 +23767,10 @@
 #: build/trans_presets.java:2412
 msgid "Line type"
-msgstr ""
+msgstr "Linie type"
 
 #. item "Man Made/Power Line" combo "Line type"
 #: build/trans_presets.java:2412
 msgid "line"
-msgstr ""
+msgstr "linie"
 
 #: build/trans_presets.java:2412
@@ -22579,5 +23786,5 @@
 #: build/trans_presets.java:2416
 msgid "Amount of Cables"
-msgstr ""
+msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
@@ -22589,17 +23796,17 @@
 #: build/trans_presets.java:2417
 msgid "single"
-msgstr ""
+msgstr "enkelt"
 
 #: build/trans_presets.java:2417
 msgid "double"
-msgstr ""
+msgstr "dobbelt"
 
 #: build/trans_presets.java:2417
 msgid "triple"
-msgstr ""
+msgstr "tredobbelt"
 
 #: build/trans_presets.java:2417
 msgid "quad"
-msgstr ""
+msgstr "firdobbelt"
 
 #: build/trans_presets.java:2420
@@ -22615,5 +23822,5 @@
 #: build/trans_presets.java:2428 build/trans_presets.java:2558
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
@@ -22650,5 +23857,5 @@
 #: build/trans_presets.java:2443 build/trans_presets.java:2561
 msgid "Electronic purses and Charge cards"
-msgstr ""
+msgstr "Elektroniske køb og betalingskort"
 
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
@@ -22656,5 +23863,5 @@
 #: build/trans_presets.java:2444 build/trans_presets.java:2562
 msgid "Debit cards"
-msgstr ""
+msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Debit cards"
@@ -22778,4 +23985,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22810,9 +24025,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "grøn"
@@ -22988,10 +24203,10 @@
 #: build/trans_presets.java:2545
 msgid "Travel Agency"
-msgstr ""
+msgstr "Rejsebureau"
 
 #. item "Shops/Travel Agency"
 #: build/trans_presets.java:2546
 msgid "Edit Travel Agency"
-msgstr ""
+msgstr "Redigér rejsebureau"
 
 #: build/trans_presets.java:2551
@@ -23066,5 +24281,5 @@
 #: build/trans_presets.java:2555
 msgid "telephone_vouchers"
-msgstr ""
+msgstr "telefonkort"
 
 #: build/trans_presets.java:2555
@@ -23196,5 +24411,5 @@
 #: build/trans_presets.java:2637
 msgid "Hardware"
-msgstr ""
+msgstr "Isenkræmmer"
 
 #. item "Shops/Hardware"
@@ -23202,5 +24417,5 @@
 #: build/trans_presets.java:2639
 msgid "Edit Hardware Store"
-msgstr ""
+msgstr "Redigér isenkræmmer"
 
 #: build/trans_presets.java:2644
@@ -23810,10 +25025,10 @@
 #: build/trans_presets.java:3004
 msgid "Farmland"
-msgstr ""
+msgstr "Jordbrugsland"
 
 #. item "Land use/Farmland"
 #: build/trans_presets.java:3005
 msgid "Edit Farmland Landuse"
-msgstr ""
+msgstr "Redigér jordbrugsland"
 
 #. item "Land use/Farmland" text "Name"
@@ -24027,10 +25242,10 @@
 #: build/trans_presets.java:3139
 msgid "Landfill"
-msgstr ""
+msgstr "Affaldsplads"
 
 #. item "Land use/Landfill"
 #: build/trans_presets.java:3140
 msgid "Edit Landfill Landuse"
-msgstr ""
+msgstr "Redigér affaldsplads"
 
 #. item "Land use/Landfill" text "Name"
@@ -24091,29 +25306,29 @@
 #: build/trans_presets.java:3174
 msgid "no_left_turn"
-msgstr ""
+msgstr "ingen_venstre_sving"
 
 #: build/trans_presets.java:3174
 msgid "no_right_turn"
-msgstr ""
+msgstr "ingen_højre_sving"
 
 #: build/trans_presets.java:3174
 msgid "no_straight_on"
-msgstr ""
+msgstr "ingen_lige_ud"
 
 #: build/trans_presets.java:3174
 msgid "no_u_turn"
-msgstr ""
+msgstr "ïngen_u_vendinger"
 
 #: build/trans_presets.java:3174
 msgid "only_right_turn"
-msgstr ""
+msgstr "kun_højre_sving"
 
 #: build/trans_presets.java:3174
 msgid "only_left_turn"
-msgstr ""
+msgstr "kun_venstre_sving"
 
 #: build/trans_presets.java:3174
 msgid "only_straight_on"
-msgstr ""
+msgstr "kun_lige_ud"
 
 #. item "Relations/Turn restriction" text "Name"
@@ -24122,5 +25337,5 @@
 #: build/trans_presets.java:3179
 msgid "from way"
-msgstr ""
+msgstr "fra vej"
 
 #. item "Relations/Turn restriction" role "from way"
@@ -24132,5 +25347,5 @@
 #: build/trans_presets.java:3181
 msgid "to way"
-msgstr ""
+msgstr "til vej"
 
 #. item "Relations/Turn restriction" role "to way"
@@ -24151,5 +25366,5 @@
 #: build/trans_presets.java:3189
 msgid "Route type"
-msgstr ""
+msgstr "vejtype"
 
 #. item "Relations/Route" combo "Route type"
@@ -24220,7 +25435,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "cykel"
@@ -24290,7 +25505,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "fod"
@@ -24302,5 +25517,5 @@
 #: build/trans_presets.java:3189
 msgid "tram"
-msgstr ""
+msgstr "sporvogn"
 
 #: build/trans_presets.java:3189
@@ -24316,5 +25531,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "undergrundsbane"
@@ -24343,5 +25558,5 @@
 #: build/trans_presets.java:3197
 msgid "alternate"
-msgstr ""
+msgstr "skiftende"
 
 #: build/trans_presets.java:3197
@@ -24462,5 +25677,5 @@
 #: build/trans_style.java:72
 msgid "standard"
-msgstr ""
+msgstr "standard"
 
 #. mappaint style named "standard"
@@ -24610,5 +25825,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24650,5 +25865,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "hest"
@@ -24758,4 +25973,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24793,5 +26014,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24864,11 +26085,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24931,7 +26152,7 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
-msgstr ""
+msgstr "hovedlandevej"
 
 #. color street
@@ -24985,7 +26206,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -25056,9 +26277,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "bane"
@@ -25150,7 +26371,7 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
-msgstr ""
+msgstr "te´jenester"
 
 #. color services
@@ -25162,5 +26383,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25181,10 +26402,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25194,5 +26415,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25207,5 +26428,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "flodbred"
@@ -25219,7 +26440,7 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
-msgstr ""
+msgstr "bæk"
 
 #. color water
@@ -25231,7 +26452,7 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
-msgstr ""
+msgstr "havn"
 
 #. color dock
@@ -25418,13 +26639,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "menneskeskabt"
@@ -25486,7 +26707,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25509,10 +26730,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25548,7 +26769,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25594,6 +26815,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25607,5 +26828,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -25627,5 +26848,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25639,5 +26860,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25699,7 +26920,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25716,5 +26937,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25729,5 +26950,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25742,5 +26963,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25755,5 +26976,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25768,5 +26989,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25781,5 +27002,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25899,13 +27120,13 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
-msgstr ""
+msgstr "kraft"
 
 #. color manmade
@@ -25917,7 +27138,7 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
-msgstr ""
+msgstr "mole"
 
 #. color pier
@@ -25929,5 +27150,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "rørledning"
@@ -26071,13 +27292,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "rekreation"
@@ -26091,5 +27312,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "marina"
@@ -26185,10 +27406,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26290,14 +27511,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26693,5 +27921,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26716,23 +27944,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26764,6 +27992,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26824,8 +28052,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "helbred"
@@ -27178,26 +28406,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "butik"
@@ -27269,8 +28497,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27341,5 +28569,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27348,5 +28576,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27356,5 +28584,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27363,5 +28591,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27371,9 +28599,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turisme"
@@ -27461,14 +28689,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historisk"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27477,5 +28704,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "stenbrud"
@@ -27489,7 +28716,7 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
-msgstr ""
+msgstr "opfyldning"
 
 #. color landfill
@@ -27509,7 +28736,7 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
-msgstr ""
+msgstr "basin"
 
 #. color basin
@@ -27521,5 +28748,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "skov"
@@ -27533,7 +28760,7 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
-msgstr ""
+msgstr "gårdsplads"
 
 #. color farmyard
@@ -27554,5 +28781,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27566,5 +28793,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industri"
@@ -27578,5 +28805,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27590,5 +28817,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27602,5 +28829,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27657,7 +28884,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "militær"
@@ -27671,5 +28898,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "kirkegård"
@@ -27682,7 +28909,7 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
-msgstr ""
+msgstr "top"
 
 #. color peak
@@ -27695,5 +28922,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "gletsjer"
@@ -27707,5 +28934,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulkan"
@@ -27760,8 +28987,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27775,5 +29002,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "buskads"
@@ -27787,5 +29014,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "hede"
@@ -27799,5 +29026,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27811,5 +29038,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr ""
@@ -27823,5 +29050,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "strand"
@@ -27899,10 +29126,10 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
-msgstr ""
+msgstr "rute"
 
 #. color route
@@ -27923,4 +29150,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27948,7 +29216,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "grænse"
@@ -28098,11 +29371,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "sted"
@@ -28150,6 +29423,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adresse"
@@ -28398,5 +29671,5 @@
 #: build/trans_wms.java:10
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
@@ -28462,5 +29735,5 @@
 #: build/trans_wms.java:34
 msgid "NPE Maps (Tim)"
-msgstr ""
+msgstr "NPE kort (Tim)"
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
@@ -28475,15 +29748,15 @@
 #: build/trans_wms.java:39
 msgid "MLIT Japan (ORTHO)"
-msgstr ""
+msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:40
 msgid "MLIT Japan (ORTHO01)"
-msgstr ""
+msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO02)"
-msgstr ""
+msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
@@ -28503,5 +29776,23 @@
 #: build/trans_wms.java:47
 msgid "Sicily - Italy"
-msgstr ""
+msgstr "Sicilen - Italien"
+
+#~ msgid "Looking up available translations..."
+#~ msgstr "Kigger efter tilgængelige oversættelser..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Basis URLen for OSM serveren (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Login-navn (e-mail) til OSM-kontoen."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Login-adgangskode til OSM-kontoen. Efterlad tom for ikke at gemme nogen "
+#~ "adgangskode."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "OSM-brugernavn (e-mail)"
 
 #~ msgid "Move"
@@ -28656,7 +29947,4 @@
 #~ msgstr "Login-navn (e-mail) til OSM-kontoen."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-brugernavn (e-mail)"
-
 #~ msgid "Plugin already exists"
 #~ msgstr "Udvidelsen findes allerede"
@@ -28792,12 +30080,6 @@
 #~ msgstr "Importér TCX-fil..."
 
-#~ msgid "Validate"
-#~ msgstr "Validér"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
-
-#~ msgid "Request Update"
-#~ msgstr "Anmod om opdatering"
 
 #~ msgid "Open images with AgPifoJ..."
@@ -29279,7 +30561,4 @@
 #~ msgstr "Mangler primitiv"
 
-#~ msgid "Update failed"
-#~ msgstr "Opdateringen fejlede"
-
 #~ msgid "Updates the currently selected primitives from the server"
 #~ msgstr "Opdaterer de valgte primitiver fra serveren"
@@ -29333,7 +30612,4 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Kunne ikke opstarte API'et. Prøv igen senere."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Opstart af API'et fejlede"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 19246)
+++ applications/editors/josm/i18n/po/de.po	(revision 19319)
@@ -6,4 +6,5 @@
 # Dirk Stöcker <openstreetmap@dstoecker.de>, 2008, 2009.
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -12,7 +13,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-31 15:00+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-03 16:00+0000\n"
+"Last-Translator: Andre Hinrichs <andre.hinrichs@gmx.de>\n"
 "Language-Team: Deutsch\n"
 "MIME-Version: 1.0\n"
@@ -20,9 +21,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:20+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
@@ -89,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -120,5 +121,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -126,6 +127,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -137,9 +138,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -178,5 +179,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -204,11 +204,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
-msgstr "OpenStreetMap-Editor in Java"
+msgstr "Java-OpenStreetMap-Editor"
 
 #. Add the version number
@@ -303,4 +303,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Fortfahren"
@@ -331,5 +332,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -345,7 +346,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -481,6 +485,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -559,5 +564,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -571,5 +576,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Information"
@@ -770,15 +775,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Entfernen"
@@ -856,6 +861,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1511,14 +1516,15 @@
 msgstr[1] "zu {0} Objekten"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Seite für allgemeine Einstellungen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -1664,17 +1670,17 @@
 msgstr "Hilfe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusbericht"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "In die Zwischenablage kopieren und schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1823,29 +1829,29 @@
 msgstr "Dieser Knoten ist mit nichts verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Bitte wählen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Ein Knoten mit Merkmalen, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
@@ -1853,5 +1859,5 @@
 "oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1860,5 +1866,5 @@
 "verwendet werden, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1867,5 +1873,5 @@
 "werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1879,9 +1885,9 @@
 "und alle Knoten werden ausgewählt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Knotenpunkte getrennt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1889,5 +1895,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2058,4 +2064,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Zurück"
@@ -3349,19 +3357,19 @@
 "Lesezeichen-Datei ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Einstellungen auf {0} gespeichert"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Kann keine Einstellungen vom Server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
@@ -3369,5 +3377,5 @@
 "Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3378,5 +3386,5 @@
 "der Lesezeichen vom Server"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3389,7 +3397,7 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr ""
-"Laden der Ressource ''{0}'' ist fehlgeschlagen. Die Fehlermeldung ist {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
+"Die Ressource ''{0}'' konnte nicht geladen werden. Die Fehlermeldung ist: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3601,4 +3609,6 @@
 "{0}"
 msgstr ""
+"Neuen Objekten kann keine Änderungssatznummer > 0 zugewiesen werden. "
+"Änderungssatznummer ist {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
@@ -3835,6 +3845,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -4004,5 +4014,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -4017,10 +4027,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "Straße"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -4028,15 +4038,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "Gewässer"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "Landfläche"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -4049,6 +4059,11 @@
 msgstr[1] "{0} Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Öffentliche Verkehrsmittel"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -4057,5 +4072,5 @@
 msgstr[1] "{0} Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4097,9 +4112,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Authentisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Verbindung fehlgeschlagen"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Objekt gelöscht"
@@ -4129,4 +4154,6 @@
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Für den Parameter ''{0}'' wird ein nicht-leerer Wert benötigt (versucht "
+"wurde: ''{1}'')"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4207,65 +4234,65 @@
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Die Sprache festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4278,9 +4305,9 @@
 "wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4291,25 +4318,25 @@
 "--selection verwendet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktualisierte Plugins aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4322,5 +4349,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4329,5 +4356,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4437,5 +4464,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Nutzer:"
@@ -5145,5 +5172,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5158,5 +5185,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5164,5 +5191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5252,5 +5279,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "Kein"
@@ -5439,6 +5466,14 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
-msgstr ""
+"place of the original way in the relation.</html>"
+msgstr ""
+"<html>Die Wege, die zusammengefasst werden sollen, sind Mitglied einer oder "
+"mehrerer Relationen. Bitte entscheiden Sie, ob Sie diese Mitgliedschaften "
+"für den zusammengefassten Weg <strong>beibehalten</strong> oder "
+"<strong>auflösen</strong> möchten.<br />Standardmäßig wird die "
+"Mitgliedschaft des ersten Wegs <strong>beibehalten,</strong> und die "
+"Mitgliedschaft der weiteren Wege wird <strong>aufgelöst.</strong> Der "
+"zusammengefasste Weg tritt in der Relation an die Stelle des ursprünglichen "
+"ersten Wegs."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5449,6 +5484,14 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
-msgstr ""
+"the place of the original node in the relation.</html>"
+msgstr ""
+"<html>Die Knoten, die zusammengefasst werden sollen, sind Mitglied einer "
+"oder mehrerer Relationen. Bitte entscheiden Sie, ob Sie diese "
+"Mitgliedschaften für den zusammengefassten Knoten <strong>beibehalten</"
+"strong> oder <strong>auflösen</strong> möchten.<br />Standardmäßig wird die "
+"Mitgliedschaft des ersten Knotens <strong>beibehalten,</strong> und die "
+"Mitgliedschaft der weiteren Knoten wird <strong>aufgelöst.</strong> Der "
+"zusammengefasste Knoten tritt in der Relation an die Stelle des "
+"ursprünglichen ersten Knotens."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
@@ -5484,4 +5527,7 @@
 "html>"
 msgstr ""
+"<html>Anwählen, um nur die Änderungssätze für gerade ausgewählte Objekte zu "
+"sehen.<br>Abwählen, um Änderungssätze für alle Objekte des aktuellen Layers "
+"zu sehen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
@@ -5546,5 +5592,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5553,5 +5599,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5640,13 +5686,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Hinzufügen"
@@ -5779,33 +5825,33 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Editor für die gewählte Relation öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5814,21 +5860,21 @@
 "öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "Mitglieder auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "Alle Mitglieder der ausgewählten Relationen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "Elemente herunterladen"
@@ -5923,4 +5969,6 @@
 "this system.</html>"
 msgstr ""
+"<html>URL konnte nicht erzeugt werden, weil die Zeichenkodierung "
+"''{0}''<br>auf diesem Computer nicht vorhanden ist.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
@@ -5989,5 +6037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
+msgstr "Lädt neue Daten für die ausgewählten Änderungssätze vom OSM-Server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
@@ -6013,4 +6061,7 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
+"<html>Sie haben keine Benutzerkennung eingestellt, daher kann JOSM Ihre</"
+"br>Änderungssätze nicht vom Server laden. Geben Sie Ihren </br>OSM-"
+"Benutzernamen in den Einstellungen an.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -6069,4 +6120,6 @@
 msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Für den Parameter {0} wird ein positiver, ganzzahliger Wert benötigt. "
+"Angegeben wurde aber ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
@@ -6132,5 +6185,9 @@
 "''{0}''.</html>"
 msgstr[0] ""
+"<html>Das ausgewählte Objekt ist in der aktuellen Ebene<br />''{0}'' nicht "
+"verfügbar.</html>"
 msgstr[1] ""
+"<html>Keines der ausgewählten Objekte ist in der aktuellen<br />Ebene "
+"''{0}'' verfügbar.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -6151,5 +6208,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Nichts zum zoomen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
@@ -7108,4 +7165,6 @@
 msgid "Remove the changeset in the detail view panel from the local cache"
 msgstr ""
+"Den Änderungssatz in der Detail-Ansicht aus dem lokalen Zwischenspeicher "
+"entfernen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
@@ -7118,4 +7177,6 @@
 "layer"
 msgstr ""
+"Die in diesem Änderungssatz bearbeiteten Objekte in der aktuellen Ebene "
+"auswählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -7126,4 +7187,6 @@
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
+"<html>Keines der Objekte, die im Änderungssatz {0} bearbeitet wurden, ist "
+"in<br>aktuellen Ebene ''{1}'' verfügbar.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
@@ -7164,4 +7227,6 @@
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
+"Den Änderungssatz mit der angegebenen Nummer inklusive bearbeiteter Objekte "
+"herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -7170,161 +7235,180 @@
 "> 0"
 msgstr ""
+"Dieser Wert ist keine gültige Nummer für einen Änderungssatz. Bitte geben "
+"Sie eine positive Ganzzahl ein."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+msgstr "Bitte geben Sie eine positive Ganzzahl ein"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+msgstr "Änderungssätze bestimmter Benutzer auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+msgstr "Änderungssätze auswählen, die offen oder geschlossen sind"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+msgstr "Änderungssätze nach Zeitraum auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+msgstr "Nur Änderungssätze eines bestimmten geografischen Bereichs auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+msgstr "Nur nach offenen Änderungssätzen suchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+msgstr "Nur nach geschlossenen Änderungssätzen suchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+msgstr "Nach offenen und geschlossenen Änderungssätzen suchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+msgstr "Benutzername: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+msgstr "Nur meine eigenen Änderungssätze"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr "Nur Änderungssätze vom Nutzer mit der folgenden Benutzerkennung"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Nur Änderungssätze vom Nutzer mit folgendem Namen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
 "is anonymous"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+"Auswahl kann nicht auf eigene Änderungssätze begrenzt werden, weil keine "
+"Benutzerkennung eingegeben wurde."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr "Der Wert ''{0}'' für die Benutzerkennung ist ungültig"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+"Auswahl kann nicht auf Änderungssätze des Benutzers ''{0}'' begrenzt werden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr "Bitte eine gültige Benutzerkennung eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr "Bitte einen Nutzernamen eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr "Ungültiger Nutzername"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr "Datum: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+msgstr "Nur Änderungssätze, die nach diesem Zeitpunkt geschlossen wurden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+"Nur Änderungssätze, die vor einem bestimmten Zeitraum erstellt und "
+"geschlossen wurden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+"Kann keine Anfrage nach Änderungssätzen formulieren. Die Eingaben sind "
+"ungültig."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
 "specific time range.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+"<html>Bitte geben Sie gültige Werte für Datum und Uhrzeit ein,<br />um die "
+"Anfrage auf einen Zeitbereich zu beschränken.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+msgstr "Ungültige Werte für Datum/Uhrzeit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
 "invalid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+"Auswahl kann nicht auf geografischen Bereich begrenzt werden. Die Eingaben "
+"sind ungültig."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
 "changeset query to a specific bounding box.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+"<html>Bitte geben Sie gültige Werte für die geografische Länge und Breite "
+"ein, um<br>die Änderungssatzanfrage auf diesen Bereich zu beschränken.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+msgstr "Ungültiges Koordinatenfenster"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+"Der Wert ist keine gültige Benutzernummer. Bitte geben Sie eine positive "
+"Ganzzahl ein."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+"<html>Der Wert ist kein gültiger Benutzername.<br />Bitte geben Sie einen "
+"Benutzernamen ein.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+msgstr "Bitte einen Nutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7332,6 +7416,8 @@
 "<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+"Bitte geben Sie das Datum im ortsüblichen Format an.<br>Beispiel: {0}"
+"<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7339,8 +7425,10 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
+"Bitte geben Sie die Uhrzeit im ortsüblichen Format an.<br>Beispiel: {0}"
+"<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Nur meine Änderungssätze herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7349,4 +7437,6 @@
 "include all changesets in the query.</html>"
 msgstr ""
+"<html>Anwählen, um nur eigene Änderungsgruppen abzufragen.<br>Abwählen, um "
+"alle Änderungsgruppen abzufragen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7356,20 +7446,23 @@
 "default query."
 msgstr ""
+"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
+"Standard-Abfrage."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Standard"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
-msgstr ""
+msgid "Download changesets using predefined queries"
+msgstr "Änderungssätze mit vorgefertigten Anfragen herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "von URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
-msgstr ""
+msgid "Query changesets from a server URL"
+msgstr "Änderungssätze mittels Server-URL herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
@@ -7379,62 +7472,67 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
-msgstr ""
+msgid "Use a custom changeset query"
+msgstr "Eine eigene Änderungssatzanfrage formulieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Änderungssätze abfragen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Änderungssätze abfragen und herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr ""
+msgstr "Bitte geben Sie einen URL mit einer gültigen Änderungssatzanfrage ein."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "Ungültiger URL für Änderungssatzanfrage"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "Dialog schließen und Laden der Änderungssätze abbrechen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Änderungssätze werden gesucht und heruntergeladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Benzuternummer des aktuellen Benutzers herausfinden..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Änderungssätze suchen und herunterladen..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+msgstr "URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr "Bitte geben Sie einen URL an, der eine Änderungssatzanfrage darstellt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr "Beispiele"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Beachten Sie, dass Änderungssatzanfragen derzeit immer an ''{0}'' gerichtet "
+"werden, ungeachtet der Servernamen, Ports und Pfadangaben aus dem URL, den "
+"Sie unten eingeben."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7443,10 +7541,10 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7455,10 +7553,10 @@
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7467,5 +7565,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7474,9 +7572,9 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
@@ -7504,61 +7602,57 @@
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "{0} Relation löschen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr "Relation auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Es ist keine Relation ausgewählt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr "Relation in Hauptauswahl übernehmen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Linienaussehen wählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr "In Relationsliste auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Linienaussehen wählen"
+msgstr "Relation in Relationsliste auswählen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7616,5 +7710,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7629,11 +7723,11 @@
 msgstr[1] "{0} unvollständige Kinder der Relation \"{1}\" herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr "Relationen herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}: Relation ''{2}'' herunterladen..."
 
@@ -7777,13 +7871,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Die Reihenfolge der Relationselemente umdrehen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
 msgid "Reverse"
-msgstr ""
+msgstr "Umkehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Relation Editor: Reverse"
-msgstr ""
+msgstr "Relationseditor: Umkehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
@@ -8207,5 +8301,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Class Type"
-msgstr ""
+msgstr "Klassentyp"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
@@ -8221,9 +8315,9 @@
 msgctxt "placeselection"
 msgid "Zoom"
-msgstr ""
+msgstr "Zoomstufe"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
 msgid "Choose the server for searching:"
-msgstr ""
+msgstr "Folgenden Server für Suche benutzen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
@@ -8295,6 +8389,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8665,4 +8760,6 @@
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
+"Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil keine aktuelle "
+"Ebene definiert ist"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -8672,4 +8769,6 @@
 "include such a primitive"
 msgstr ""
+"Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil die aktuelle Ebene "
+"kein solches Objekt enthält"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
@@ -8815,5 +8914,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "In einen neuen Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
@@ -8823,9 +8922,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "In einen existierenden Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Daten in einen existierenden und offenen Änderungssatz hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
@@ -8883,4 +8982,6 @@
 "exception."
 msgstr ""
+"Warnung: Der Autorisierungsdialog wird wegen einer Java-"
+"Sicherheitseinschränkung möglicherweise nicht als oberstes Fenster gezeigt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -8910,4 +9011,6 @@
 "username and a valid password.</html>"
 msgstr ""
+"<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschalgen. Geben Sie "
+"bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8938,4 +9041,6 @@
 "the password may be transferred unencrypted.</html>"
 msgstr ""
+"<html>Warnung: Je nachdem, welche Autorisierungsmethode der Proxy-Server "
+"benutzt, wird das Kennwort möglicherweise unverschlüsselt übertragen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -8945,5 +9050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Mit dem angegebenen Benutzernamen und Kennwort anmelden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
@@ -9271,8 +9376,10 @@
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
+"Offene Änderungssätze verwalten und auswählen, zu welchem davon Änderungen "
+"hinzugefügt werden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Erweiterte Einstellungen konfigurieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:170
@@ -9280,5 +9387,5 @@
 #, java-format
 msgid "Upload to ''{0}''"
-msgstr ""
+msgstr "Zu ''{0}'' hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:358
@@ -9333,4 +9440,5 @@
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
+"Objekte werden in einem <strong>neuen Änderungssatz</strong> hochgeladen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9340,16 +9448,19 @@
 "comment ''{1}''."
 msgstr ""
+"Objekte werden dem <strong>existierenden Änderungssatz</strong> {0} mit dem "
+"Kommentar ''{1}'' hinzugefügt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
+msgstr "Der Änderungssatz wird nach dem Hochladen <strong>geschlossen</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56
 msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr ""
+msgstr "Der Änderungssatz bleibt nach dem Hochladen <strong>geöffnet</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
 msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
 msgstr ""
+" (<a href=\"urn:changeset-configuration\">Änderungssatz konfigurieren</a>)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80
@@ -9359,5 +9470,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"<strong>{0} Objekt</strong> wird <strong>einem Änderungssatz</strong> "
+"hinzugefügt"
 msgstr[1] ""
+"<strong>{0} Objekte</strong> werden <strong>einem Änderungssatz</strong> "
+"hinzugefügt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -9370,5 +9485,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"<strong>{0} Objekt</strong> wird <strong>einem Änderungssatz</strong> in "
+"<strong>einem Vorgang</strong> hinzugefügt"
 msgstr[1] ""
+"<strong>{0} Objekte</strong> werden <strong>einem Änderungssatz</strong> in "
+"<strong>einem Vorgang</strong> hinzugefügt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -9414,5 +9533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
 msgid "Click to return to the Upload Dialog"
-msgstr ""
+msgstr "Klicken, um zum Hochladedialog zurückzukehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
@@ -9434,6 +9553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9450,5 +9569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
 msgid "Changeset is full"
-msgstr ""
+msgstr "Änderungssatz ist voll"
 
 #. we tried to delete an already deleted primitive.
@@ -9531,22 +9650,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
 msgid "Fill up one changeset and return to the Upload Dialog"
-msgstr ""
+msgstr "Einen Änderungssatz füllen und zurück zum Hochlade-Dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "So viele Änderungssätze öffnen und benutzen, wie nötig sind"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
-msgstr ""
+msgstr "Hochladen in einem Vorgang nicht möglich (zu viele Objekte)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
@@ -9555,4 +9673,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -10011,24 +10136,24 @@
 msgstr[1] "{0} Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-Dateien (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Einlesen von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10040,34 +10165,34 @@
 "dem Foto und wählen eine Zeitzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Fotozeit (aus EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-Zeit (aus obigem Photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Ich bin in der Zeitzone von: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Kein Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Ein anderes Foto öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Zeit von Foto und GPS-Empfänger synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -10077,114 +10202,116 @@
 "Bitte verwenden Sie das geforderte Format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Bisher keine GPS-Daten geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPS-Spur: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Eine andere GPS-Spur laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Automatisch ermitteln"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgstr "Manuell justieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+msgstr "Vorschaubilder auf der Karte anzeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Zeitzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+msgstr "Keine GPS-Spur ausgewählt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Bilder mit GPS-Spur korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Ungültige Zeitzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Ungültiger Offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+msgstr "Erneut versuchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+msgstr "Es gibt keine passenden Bilder!"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zeitzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10195,21 +10322,21 @@
 "synchonisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Zeitzone und Offset anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Die gewählten Bilder enthalten keine Zeitinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Bilder enthalten keine Zeitinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10218,17 +10345,17 @@
 "andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPS-Spur enthält keine Zeitinformationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Wählen Sie eine GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Keine GPS-Spur gewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10239,5 +10366,5 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10248,56 +10375,56 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Verzeichnisuntersuchen starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Eine der ausgewählten Dateien war nicht vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Photos lesen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Einlesen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Verzeichnis {0} untersuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10305,24 +10432,24 @@
 msgstr[1] "Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+msgstr "Bilddatei von der Platte löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
-msgstr ""
+msgstr "Bilddatei konnte nicht gelöscht werden."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
@@ -10352,5 +10479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr ""
+msgstr "Vorheriges Bild zeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -10360,5 +10487,5 @@
 #, java-format
 msgid "Geoimage: {0}"
-msgstr ""
+msgstr "Geoimage: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
@@ -10368,5 +10495,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 msgid "Delete File from disk"
-msgstr ""
+msgstr "Datein von Platte löschen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
@@ -10377,5 +10504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
 msgid "Show next Image"
-msgstr ""
+msgstr "Nächstes Bild zeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
@@ -10389,5 +10516,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134
 msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "Dialog in die Seitenleiste verschieben"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
@@ -10512,9 +10639,596 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Ungültiges Strichelungsmuster - Werte müssen positiv sein"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Globale Einstellungen verwenden."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autoren"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Klicken, um das Vereinigen abzubrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Benutzername: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Kennwort:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Nach rechts drehen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Eigenschaften hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autoren"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Bitte einen Benutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Benutzernamen Ihres OSM-Zugangs eingeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Zugang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Erweiterte Einstellungen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Geben Sie einen Suchausdruck ein"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Bitte einen Benutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Bitte einen Benutzernamen angeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Klicken Sie um die aktuelle Aufgabe abzubrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Bitte mindestens einen Weg oder Knoten wählen."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Nichts gefunden für Suche ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Fenster schließen und Herunterladen abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Dialog schließen und neuen Knoten anlegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Mehrere Knoten von \"{0}\" abrufen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#, fuzzy
+msgid "Initializing a session at the OSM website..."
+msgstr "Initialisiere Relationen zum Aktualisieren ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, fuzzy, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr "Übersetzung für Sprache ''{0}'' prüfen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Fehlendes erforderliches Attribut \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, fuzzy, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Verfügbare Stile von ''{0}'' laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Einstellungen hochladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Identifikation des Turms"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Details der Anfrage: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> wird momentan in Ebene ''{1}'' "
+"bearbeitet</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+#, fuzzy
+msgid "Go back to step 1/3"
+msgstr "Gehe zurück zum Hochladen-Dialog"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Klicken, um Ziel zu entfernen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Notfallrettungspunkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Klicken, um Ziel zu entfernen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Zugang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Verbindung fehlgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Der OSM-Server<br>''{0}''<br>hat einen internen Serverfehler gemeldet."
+"<br>Meist ist dies ein vorübergehendes Problem. Bitte versuchen Sie es "
+"später erneut.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "Zeichenkette;Zeichenkette;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10548,5 +11262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10554,5 +11268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10560,7 +11274,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Bitte wählen Sie die zu löschende Zeile."
@@ -11032,12 +11746,4 @@
 msgstr "OSM-Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Sicherungsdateien erstellen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -11076,17 +11782,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Verhalten und Aussehen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Sprache"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr "Verfügbare Übersetzungen suchen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Standard (Automatisch)"
@@ -11153,10 +11854,20 @@
 msgstr "Pluginquellen bearbeiten"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Dialog schließen und neuen Knoten anlegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Updates abbrechen und den Dialog schliessen"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11164,29 +11875,29 @@
 msgstr "Verschiedene Optionen, die das Aussehen des Programms festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Verbindungseinstellungen zum OSM-Server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Karten-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Audio-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Einstellungen für den Audio-Player und Audio-Marken."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam."
@@ -11215,92 +11926,29 @@
 "benutzt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Authentisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxy-Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Die Basis-URL des OSM Servers (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Benutzername (E-Mail) für den OSM-Server."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
-"soll."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Server Basis-URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM-Benutzername (E-Mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM-Passwort"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
-"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
-"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11602,4 +12250,264 @@
 msgstr "Steuertastengruppen"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Ungültige URL?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Öffnen einer Verbindung zum entfernten Server<br>''{0}'' "
+"fehlgeschlagen.<br>Bitte prüfen Sie die Internetverbindung.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Verbindung fehlgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+#, fuzzy
+msgid "Use Basic Authentication"
+msgstr "Authentifizierung abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+#, fuzzy
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr "Mit dem angegebenen Benutzernamen und Kennwort anmelden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Voreinstellungen verwenden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, fuzzy, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
+"Standard-Abfrage."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Sicherungsdateien erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Beim Speichern eine Sicherheitskopie endend auf ~ erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM-Benutzername (E-Mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM-Passwort"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
+"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
+"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Einstellungen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Server Basis-URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "Prüfung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+#, fuzzy
+msgid "The API URL is valid."
+msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Aktueller Wert ist Standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Bitte JOSM neu starten."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr "Server:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr "Port:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+"Bitte geben Sie einen Benutzernamen und ein Kennwort an, wenn Ihr Proxy eine "
+"Anmeldung erwartet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr "Kennwort:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr "Kein Proxy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr "Standard-Systemeinstellungen nutzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr "HTTP-Proxy manuell konfigurieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr "SOCKS-Proxy nutzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11698,17 +12606,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
 msgid "Min. latitude"
-msgstr ""
+msgstr "Min. Breite"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
 msgid "Min. longitude"
-msgstr ""
+msgstr "Min. Länge"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
 msgid "Max. latitude"
-msgstr ""
+msgstr "Max. Breite"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
 msgid "Max. longitude"
-msgstr ""
+msgstr "Max. Länge"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
@@ -11717,4 +12625,6 @@
 "a bounding box)"
 msgstr ""
+"URL von www.openstreetmap.org (Sie können hier einen Download-URL "
+"hineinkopieren, um einen Bereich anzugeben)"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -11743,5 +12653,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11763,4 +12673,5 @@
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"Der Wert {1} ist keine gültige geografische Länge für den Parameter ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:130
@@ -11768,4 +12679,5 @@
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
 msgstr ""
+"Der Wert {1} ist keine gültige geografische Breite für den Parameter ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:293
@@ -11789,29 +12701,37 @@
 "and ''display_name''"
 msgstr ""
+"Änderungssatzanfragen, die sowohl die Parameter ''uid'' als auch "
+"''display_name'' enthalten, sind nicht möglich"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+msgstr "Nicht unterstützter Parameter ''{0}'' in der Änderungssatzanfrage"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11820,16 +12740,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11837,5 +12757,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11843,5 +12763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11852,10 +12772,10 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
 msgid "Parsing response from server..."
-msgstr ""
+msgstr "Server-Antwort wird verarbeitet..."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Unerwartetes XML-Element mit dem Namen ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
@@ -12079,5 +12999,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -12125,5 +13045,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -12171,15 +13091,14 @@
 msgstr "OK - erneuter Versuch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Starte Wiederholung {0} von {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-"Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
@@ -12188,5 +13107,5 @@
 "ist {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -12195,11 +13114,11 @@
 "erhalten."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12372,4 +13291,21 @@
 msgstr "Liste der Änderungssätze einlesen..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
+"Standard-Abfrage."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12624,5 +13560,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:59
 msgid "Reading changesets..."
-msgstr "Änderungssetze einlesen..."
+msgstr "Änderungssätze einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:65
@@ -12694,24 +13630,29 @@
 "Internetverbindung."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "Das XML-Element <user> fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Das Attribut ''{0}'' des XML-Elements ''{1}'' fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 "Ungültiger Wert \"{2}\" für das Attribut ''{0}'' des XML-Elements ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Änderungssatz {0} einlesen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -13113,5 +14054,5 @@
 msgstr "Parameter ''{0}'' vom Typ Knoten erwartet, aber ''{1}'' erhalten"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -13123,5 +14064,5 @@
 "Internetverbindung.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -13135,5 +14076,5 @@
 "{0} und laden Sie erneut hoch.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -13146,5 +14087,34 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschalgen. Geben Sie "
+"bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschalgen. Geben Sie "
+"bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -13155,5 +14125,5 @@
 "<br> weil der Änderungssatz bereits geschlossen wurde.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -13164,5 +14134,5 @@
 "<br> weil der Änderungssatz bereits am {1} geschlossen wurde.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -13173,9 +14143,9 @@
 "Fehlermeldung ist:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Der Server hat einen Konflikt identifiziert.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -13186,5 +14156,5 @@
 "er bereits {1} geschlossen wurde.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -13197,5 +14167,5 @@
 "Applet<br>nicht von ''{1}'' geladen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -13206,5 +14176,5 @@
 "fehlgeschlagen.<br>Bitte prüfen Sie die Internetverbindung.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -13215,5 +14185,5 @@
 "Herunterladen.<br>Details: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -13225,10 +14195,10 @@
 "später erneut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Der OSM-Server \"{0}\" meldet eine Fehlerhafte Anfrage. <br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -13240,10 +14210,10 @@
 "Datenbankexport."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Fehlermeldung (englisch): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -13258,5 +14228,5 @@
 "<br>Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13270,5 +14240,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13284,18 +14254,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr "Verfügbare Übersetzungen suchen..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr "Übersetzungen prüfen..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr "Übersetzung für Sprache ''{0}'' prüfen"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13332,4 +14289,10 @@
 "Spracheinstellungen ''{0}'' abgeleitet werden. Die Standardspracheinstellung "
 "''en'' wird benutzt."
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -13742,5 +14705,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Feuille auswählen"
@@ -13793,5 +14756,11 @@
 msgstr "CadastreGrabber: Ungültige URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13802,25 +14771,23 @@
 "oder Aktion abgebrochen"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Wähle aus..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Wähle eine Kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Wähle aus..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13833,13 +14800,13 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM wird zum Aktivieren der Änderung beendet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13849,34 +14816,34 @@
 "Fehlermeldung ist: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Originale Hintergrundfarbe durch JOSM-Farbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Graue Farben invertieren (für schwarze Hintergründe)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Transparenten Hintergrund aktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Automatischen Zwischenspeicher aktivieren."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Max. Speichergröße (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13894,19 +14861,19 @@
 "dieses Plugins erstellt wurden, hochladen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Französisches Kataster-WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 "<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Quelle"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13916,5 +14883,5 @@
 "Hintergrundfarbe ersetzen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13924,9 +14891,9 @@
 "Nützlich für Texte auf dunklen Hintergründen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Stapeln mehrerer Schichten erlauben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13934,36 +14901,36 @@
 "durchsichtig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen"
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr "Multiplikator für Vektordaten:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Feste Quadratgröße (Standard ist 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Feste Größe (von 25 bis 1000 Meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr "Multiplikator für Pixelgrafiken:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr "Anzeige der Querstücke:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -14086,5 +15053,5 @@
 "Wollen Sie sie benutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -14094,14 +15061,14 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "Bild beschneiden"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr "Klicke in die zweite Ecke um das Bild zu beschneiden."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -14111,14 +15078,14 @@
 "(Es werden zwei Punkte benötigt.)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr "Bild georeferenzieren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Klicken Sie auf das zweite Lambert-Kreuzstück zur Georeferenzierung"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -14128,21 +15095,21 @@
 "oder es erneut versuchen "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "Bitte die Cadastre Ost,Nord-Position eingeben"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(Achtung: Pfeil muss nach Norden zeigen!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Ost"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Nord"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -14261,28 +15228,28 @@
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -14294,9 +15261,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -14305,38 +15272,38 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Verwenden"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Bitte auswählen, welches Farbschema verwendet werden soll."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Farbschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Bitte auswählen, welches Farbschema gelöscht werden soll."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Das in der Liste gewählte Schema verwenden."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Die aktuellen Farben als neues Farbschema speichern."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Das ausgewählte Farbschema aus der Liste löschen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Farbschemata"
@@ -14501,6 +15468,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Aktualisieren"
@@ -14730,33 +15697,33 @@
 msgstr "Ein unbekannter Fehler ist aufgetreten"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "Ost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "Nordost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "Nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "Nordwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "West"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "Südwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "Süd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "Südost"
@@ -14796,5 +15763,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14805,81 +15772,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "Wasser"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "Küstenlinie"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "Land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maximale Anzahl von Abschnitten je Weg"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximale Anzahl von Knoten in der Anfangs-Spur"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Höchster Grauwert, der als Wasser betrachtet wird (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Genauigkeit beim Vereinfachen von Linien (Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Auflösung der Landsat-Kacheln (Pixel pro Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Größe der Landsat-Kacheln (Pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Alle Spuren nach Osten verschieben (in Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Alle Spuren nach Norden verschieben (in Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Richtung, in der nach Land gesucht werden soll"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Wege bezeichnen als"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS-Ebene"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maximale Speichergröße (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maximales Speicheralter (Tage)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Datenquelle"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14889,5 +15856,5 @@
 "Linien vereinfacht werden). Standardwert ist 50.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14897,5 +15864,5 @@
 "Landsat IR-1-Daten). Erlaubter Bereich ist 0-255. Standard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14906,5 +15873,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14913,21 +15880,21 @@
 "4.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Größe der Landsat-Kacheln, gemessen in Pixeln. Standard ist 2.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Alle Punkte nach Osten verschieben (Grad). Standard ist 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Alle Punkte nach Norden verschieben (Grad). Standard ist 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Richtung in der nach Land gesucht werden soll. Standardmäßig Ost."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14935,26 +15902,26 @@
 "Wasser."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Zum Abzeichnen genutzte WMS-Ebene. Standard ist IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Name der Datenquelle. Standardeinstellung ist Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Ein Plugin, um Wasserflächen auf Landsat-Bildern zu kennzeichnen."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Einstellungen für das LakeWalker-Plugin"
@@ -15172,5 +16139,5 @@
 msgstr "OpenStreetBugs Lade-Warteschleife"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-Einträge anzeigen"
@@ -15201,5 +16168,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -15216,10 +16182,14 @@
 "umgewandelt werden"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs öffnen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
@@ -15227,5 +16197,9 @@
 "Herunterladen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -15235,22 +16209,32 @@
 "OpenStreetBugs abzurufen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+#, fuzzy
+msgid "Queue"
+msgstr "Abfrage"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Kommentar hinzufügen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Geben Sie einen Kommentar ein"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Kommentar:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Problem als erledigt markieren"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Wirklich schließen?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -15260,23 +16244,51 @@
 "optionalen Kommentar angeben:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Schließen"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Neuer Fehler"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Fehler anlegen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Beschreiben Sie den Fehler möglichst genau"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Erstellt"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Bitte einen Benutzernamen angeben"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Unbekannter Status des Fehlers"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugs öffnen"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15298,10 +16310,10 @@
 msgstr "Dateiendung unbekannt: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -15311,5 +16323,5 @@
 "den Pfad zu Firefox ein."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox-Programm"
@@ -15319,37 +16331,37 @@
 msgstr "PicLayer"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "Daten vom API herunterladen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "Erstelle neue Objekte"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "Auswahl ändern"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "Ansicht wechseln"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle Fernsteueraktionen manuell bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Fernbedienung"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Einstellungen für das Fernbedienungs-Plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15361,5 +16373,5 @@
 "Anwendungen adressiert werden muss, die das Plugin nutzen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Erlaubte Aktionen"
@@ -15475,25 +16487,25 @@
 msgstr "Route löschen"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Einstellungen des Routenführungsplugins"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Routenführung konfigurieren."
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Straßentyp"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Geschwindigkeit (km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Gewicht"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Gewichtswerte eingeben"
@@ -15539,42 +16551,42 @@
 msgstr "Bild "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "Automatisch Zoomen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "Kacheln automatisch laden"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Einstellungen für das Karten-Plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Quellen der Kacheln"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Automatisches Zoomen: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Kacheln automatisch laden: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr "Min. Zoomstufe: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max. Zoomstufe: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Hintergrund ausblenden: "
@@ -15810,38 +16822,38 @@
 " \"{1}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Ignorierliste verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Ignorierliste zum Unterdrücken von Warnungen verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Fehlerebene verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Fehlerebene verwenden, um problematische Elemente anzuzeigen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Unwichtige Warnungen beim Hochladen anzeigen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 "Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Auf Anforderung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Beim Hochladen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15850,5 +16862,5 @@
 "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Datenprüfungs-Plugin"
@@ -16470,5 +17482,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "Gebäude"
@@ -16482,5 +17494,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "Fläche"
@@ -16914,55 +17926,55 @@
 msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Einstellungen für WMS-Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Menüname"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Menüname (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Ausgewählte Standardwerte kopieren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Herunterladeprogramm:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Kacheln überlappen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "Ost-West (%):"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "Nord-Süd (%):"
@@ -18552,6 +19564,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobahn"
@@ -18577,6 +19589,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "Schnellstraße"
@@ -18602,6 +19614,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "Bundesstraße"
@@ -18627,6 +19639,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "Landesstraße"
@@ -18640,5 +19652,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "Kreisstraße"
@@ -18656,5 +19668,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "Ortsstraße"
@@ -18688,6 +19700,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "Service"
@@ -18721,6 +19733,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "Baustelle"
@@ -18770,5 +19782,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -19754,5 +20766,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "Marsch"
@@ -21151,7 +22163,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "Straße"
@@ -21879,28 +22891,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "Sport"
@@ -23595,4 +24607,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23627,9 +24647,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "grün"
@@ -25037,7 +26057,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "Fahrrad"
@@ -25107,7 +26127,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "Fuß"
@@ -25133,5 +26153,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "U-Bahn"
@@ -25427,5 +26447,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "veraltet"
@@ -25467,5 +26487,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "Pferd"
@@ -25575,4 +26595,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25610,5 +26636,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25681,11 +26707,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "Barriere"
@@ -25748,5 +26774,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "Autostraße"
@@ -25802,7 +26828,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "Weg"
@@ -25873,9 +26899,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "Eisenbahn"
@@ -25967,5 +26993,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "Service"
@@ -25979,5 +27005,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "Furt"
@@ -25998,10 +27024,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "Wendekreis"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26011,5 +27037,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "Notfallrettungspunkt"
@@ -26024,5 +27050,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "Flussufer"
@@ -26036,5 +27062,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "Fluss"
@@ -26048,5 +27074,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "Dock"
@@ -26235,13 +27261,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -26303,7 +27329,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "Eisenbahnpunkt"
@@ -26326,10 +27352,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "Andere Bahnen"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -26365,7 +27391,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "Alte Eisenbahn"
@@ -26411,6 +27437,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "Rollweg"
@@ -26424,5 +27450,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "Terminal"
@@ -26444,5 +27470,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "Rollweg (dunkel)"
@@ -26456,5 +27482,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -26516,7 +27542,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "Luftweg"
@@ -26533,5 +27559,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "Einfache Piste"
@@ -26546,5 +27572,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "Mittelschwere Piste"
@@ -26559,5 +27585,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "Fortgeschrittenenpiste"
@@ -26572,5 +27598,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "Expertenpiste"
@@ -26585,5 +27611,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "freie Piste"
@@ -26598,5 +27624,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "Anfängerpiste"
@@ -26716,11 +27742,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "Strom"
@@ -26734,5 +27760,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -26746,5 +27772,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "Pipeline"
@@ -26888,13 +27914,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "Freizeit"
@@ -26908,5 +27934,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "Jachthafen"
@@ -27002,10 +28028,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -27107,14 +28133,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27510,5 +28543,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27533,23 +28566,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -27581,6 +28614,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -27641,8 +28674,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "Gesundheit"
@@ -27995,26 +29028,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "Geschäft"
@@ -28086,8 +29119,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "Hotel"
@@ -28158,5 +29191,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28165,5 +29198,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -28173,5 +29206,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28180,5 +29213,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28188,9 +29221,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "Tourismus"
@@ -28278,14 +29311,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "Historisch"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28294,5 +29326,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "Steinbruch"
@@ -28306,5 +29338,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -28326,5 +29358,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "Wasserbecken"
@@ -28338,5 +29370,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "Forst"
@@ -28350,5 +29382,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "Farmland"
@@ -28371,5 +29403,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -28383,5 +29415,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -28395,5 +29427,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "Baulücke"
@@ -28407,5 +29439,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "Bauland"
@@ -28419,5 +29451,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -28474,7 +29506,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "Militär"
@@ -28488,5 +29520,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "Friedhof"
@@ -28499,5 +29531,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "Berggipfel"
@@ -28512,5 +29544,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "Gletscher"
@@ -28524,5 +29556,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "Vulkan"
@@ -28577,8 +29609,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "Natur"
@@ -28592,5 +29624,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "Buschland"
@@ -28604,5 +29636,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "Heide"
@@ -28616,5 +29648,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "Waldfläche"
@@ -28628,5 +29660,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -28640,5 +29672,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "Strand"
@@ -28716,8 +29748,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "Route"
@@ -28740,4 +29772,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28765,7 +29838,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "Grenze"
@@ -28915,11 +29993,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "Ort"
@@ -28967,6 +30045,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "Adresse"
@@ -29322,4 +30400,25 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "Looking up available translations..."
+#~ msgstr "Verfügbare Übersetzungen suchen..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Die Basis-URL des OSM Servers (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Benutzername (E-Mail) für den OSM-Server."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
+#~ "soll."
+
+#~ msgid "Loading available locales..."
+#~ msgstr "Verfügbare Übersetzungen suchen..."
+
+#~ msgid "Checking locales..."
+#~ msgstr "Übersetzungen prüfen..."
+
 #~ msgid "Load Selection"
 #~ msgstr "Auswahl laden"
@@ -29356,4 +30455,8 @@
 #~ "diesem System nicht verfügbar ist.</hml>"
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr ""
+#~ "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden."
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kann \"{0}\" nicht lesen"
@@ -29366,4 +30469,8 @@
 #~ "Ein Kommando konnte nicht gelesen werden. Der Hilfe-Browser wird "
 #~ "geschlossen. Die Fehermeldung war:"
+
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr ""
+#~ "Laden der Ressource ''{0}'' ist fehlgeschlagen. Die Fehlermeldung ist {1}"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 19246)
+++ applications/editors/josm/i18n/po/el.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-11-17 17:54+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 14:45+0000\n"
 "Last-Translator: alichani <alichani@yahoo.co.uk>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:21+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -293,4 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Συνέχεια"
@@ -321,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -335,7 +336,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -467,6 +471,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -545,5 +550,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -557,5 +562,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Πληροφορίες"
@@ -750,15 +755,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -837,6 +842,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1477,14 +1482,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Προτιμήσεις..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Άνοιξε τις προτιμήσεις για μια σελίδα για παγκόσμιες ρυθμίσεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Προτιμήσεις"
@@ -1627,17 +1633,17 @@
 msgstr "Βοήθεια: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Αναφορά Κατάστασης"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1774,38 +1780,38 @@
 msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Επιλέξτε οποιοδήποτε:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Ένας κόμβος με ετικέτα, ή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1814,5 +1820,5 @@
 "χρησιμοποιούνται από περισσότερο από έναν δρόμο."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1822,9 +1828,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Ξεκολημένος Κόμβος"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1832,5 +1838,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1995,4 +2001,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Πίσω"
@@ -3185,24 +3193,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3211,5 +3219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3220,5 +3228,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3632,6 +3640,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3797,5 +3805,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3810,10 +3818,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "Οδός ταχείας κυκλοφορίας"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3821,15 +3829,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "υδατόρρευμα"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "χρήση γής"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3842,6 +3850,11 @@
 msgstr[1] "{0} κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Μέσα Μαζικής Μεταφοράς"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3850,5 +3863,5 @@
 msgstr[1] "{0} μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3890,9 +3903,19 @@
 msgstr "Διένεξη"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Άγνωστος υπολογιστής"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -3994,65 +4017,65 @@
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Ρυθμίστε την γλώσσα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4061,9 +4084,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4074,26 +4097,26 @@
 "ότι φορτώσατε δεδομένα πριν το --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 "Αντί για το --download=<bbox> μπορείτε να καθορίσεται το osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4106,5 +4129,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4113,5 +4136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4219,5 +4242,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4878,5 +4901,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4891,5 +4914,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4897,5 +4920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4985,5 +5008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "καμοία"
@@ -5163,5 +5186,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5173,5 +5196,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5266,5 +5289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5273,5 +5296,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5354,13 +5377,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Προσθήκη"
@@ -5491,54 +5514,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Άνοιγμα λίστας όλων τον σχέσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Σχέσεις: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Διαγραφή της επιλεγμένης σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Σημιουργία νέας σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6876,58 +6899,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6935,58 +6958,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6994,9 +7017,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7004,5 +7027,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7010,15 +7033,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7026,9 +7049,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7037,5 +7060,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7062,9 +7085,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Βασικό"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7074,5 +7098,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7083,5 +7107,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7123,22 +7147,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7147,10 +7173,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7159,10 +7185,10 @@
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Αλλαγή τιμών;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7171,5 +7197,5 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7178,9 +7204,9 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
@@ -7209,61 +7235,57 @@
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Επιλογή"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7319,5 +7341,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7331,12 +7353,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -7951,6 +7973,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8995,6 +9018,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9080,9 +9103,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9104,4 +9126,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9536,24 +9565,24 @@
 msgstr[1] "{0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Αρχεία GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Σφάλμα κατά την ερμηνεία {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Αδυναμία ανάγνωσης \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9562,34 +9591,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Ώρα φωτογραφίας (από exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [ηη/μμ/εεεε ωω:λλ:δδ]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Βρίσκομαι στην ζώνη ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Χωρίς ημερομηνία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Άνοιγμα άλλης φωτογραφίας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9597,114 +9626,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Μη έγκυρη ημερομηνία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "Ίχνος GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Άνοιγμα άλλου ίχνους GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Ζώνη Ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Μετατόπιση:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Συσχέτιση"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Λανθασμένη ζώνη ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Ζώνη ώρας: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Λεπτά: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Δευτερόλεπτα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9712,38 +9743,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Δεν επιλέχθηκε ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9752,5 +9783,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9759,56 +9790,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Έναρξη σάρωσης καταλόγου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Ανάγνωση φωτογραφιών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Ανάγνωση {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Σάρωση καταλόγου {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9816,22 +9847,22 @@
 msgstr[1] "εικόνες"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10022,4 +10053,576 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Χρηση καθολικών ρυθμίσεων."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Συγγραφείς"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Κανάλι"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Όνομα χρήστη"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Κωδικός"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Περιστροφή δεξιά"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Προσθήκη Ιδιοτήτων"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Συγγραφείς"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Αποτυχία αρχικοποίησης API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Πρόσβαση"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Προχωρημένες προτιμήσεις"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Αποστολή προτιμήσεων"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Αίτηση  Ενημέρωσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Εστιατόριο"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Πρόσβαση"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Αποτυχία ενημέρωσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "συμβολοσειρά;συμβολοσειρά;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10054,5 +10657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10060,5 +10663,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10066,7 +10669,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Παρακαλώ επιλέξτε την γραμμή για διαγραφή."
@@ -10506,13 +11109,4 @@
 msgstr "Δεδομένα OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Δημιουργία αντιγράφων ασφαλείας"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Κατά την αποθήκευση, διατήρηση αντιγράφων ασφαλείας που τελειώνουν σε ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10551,17 +11145,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Όψη και Αίσθηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Προεπιλογή (οριζόμενο αυτόματα)"
@@ -10628,10 +11217,19 @@
 msgstr "Ρύθμιση τοποθεσιών πρόσθετων"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Ρυθμίσεις απεικόνισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10640,29 +11238,29 @@
 "Διάφορες ρυθμίσεις που επηρρεάζουν την εμφάνιση ολόκληρου του προγράμματος."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Ρυθμίσεις σύνδεσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Ρυθμίσεις σύνδεσης για τον διακομηστή OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Ρυθμίσεις Χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ρυθμίσεις για την προβολή χάρτη και την ερμηνεία δεδομένων."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Ρυθμίσεις Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Ρυθμίσεις για την αναπαραγωγή ήχου και σημαδιών ήχου."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
@@ -10689,88 +11287,28 @@
 msgstr "Η προβολή {0} δεν μπορούσε να ενεργοποιηθεί. Χρησιμοποιώ το Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "προορισμός"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Ρυθμίσεις διαμεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο "
-"κωδικός."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Η βασική URL για τον διακομιστή"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "Όνομα χρήστη OSM (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Κωδικός OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11049,4 +11587,249 @@
 msgstr "Ομάδες τροποποιητών"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Η σύνδεση απέτυχε."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Χρήση προκαθορισμένου"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Δημιουργία αντιγράφων ασφαλείας"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Κατά την αποθήκευση, διατήρηση αντιγράφων ασφαλείας που τελειώνουν σε ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Όνομα χρήστη OSM (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Κωδικός OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Προτιμήσεις"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Η βασική URL για τον διακομιστή"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Επαλήθευση"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Η τρέχουσα τιμή είναι η προεπιλεγμένη."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11190,5 +11973,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11240,23 +12023,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11265,16 +12054,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11282,5 +12071,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11288,5 +12077,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11522,5 +12311,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11564,5 +12353,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11610,30 +12399,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11792,4 +12581,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12087,23 +12891,28 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Ανάγνωση {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12490,5 +13299,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12497,5 +13306,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12505,5 +13314,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12513,5 +13322,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12520,5 +13354,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12527,5 +13361,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12534,9 +13368,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12545,5 +13379,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12553,5 +13387,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12560,5 +13394,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12567,5 +13401,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12574,10 +13408,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12586,10 +13420,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12600,5 +13434,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12608,5 +13442,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12617,18 +13451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12655,4 +13476,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13040,5 +13867,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13089,5 +13916,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13096,25 +13929,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Επιλέξτε από..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Επιλέξτε από..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13123,13 +13954,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13137,34 +13968,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Αντικατάσταση αρχικού φόντου με το χρώμα φόντου του JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Αντιστορή γκρι χρωμάτων (για μαύρο φόντο)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Διαφανές φόντο."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Σχεδιασμός ορίων δεδομένων που λήφθησαν."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13176,18 +14007,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Πηγή"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13197,5 +14028,5 @@
 "προτιμήσεις του JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13203,45 +14034,45 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13353,5 +14184,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13359,14 +14190,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13374,14 +14205,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13389,21 +14220,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13514,28 +14345,28 @@
 msgstr "Άδειο επίπεδο"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Δεν είναι διανυσματικό."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Είναι διανυσματικό."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13544,47 +14375,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Να χρησιμοποιηθεί"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Παρακαλώ επιλέξτε ένα θέμα για χρήση."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Θέμα χρωμάτων"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Παρακαλώ επιλέξτε το θέμα προς διαγραφή"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Χρήση του επιλεγμένου θέματος από την λίστα."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Χρήση των τρεχόντων χρωμάτων ως νέο θέμα."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Διαγραφή του επιλεγμένου θέματος από την λίστα."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Θέματα χρωμάτων"
@@ -13746,6 +14577,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Ανανέωση"
@@ -13972,33 +14803,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "ανατολικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "βορειοανατολικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "βόρεια"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "βορειοδυτικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "δυτικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "νοτιοδυτικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "νότια"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "νοτιοανατολικά"
@@ -14038,5 +14869,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14047,80 +14878,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "νερό"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "ακτογραμμή"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "γη"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Μέγιστος αριθμός κόμβων στο αρχικό ίχνος"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Μέγιστη τιμή γκρίζου που να θεωρείται νερό (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Ακρίβεια απλοποίησης γραμμής (μοίρες)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Ανάλυση πλακιδίων Landsat (pixel ανά μοίρα)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Μέγεθος πλακιδίων Landsat (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Μετατόπιση όλων των ιχνών ανατολικά (μοίρες)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Μετατόπιση όλων των ιχνών βόρεια (μοίρες)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Κατεύθυνση για αναζήτηση ξηράς"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Επίπεδο WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Μέγιστο μέγεθος cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Μέγιστη ηλικία cache (ημέρες)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Πηγαίο κείμενο"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14128,5 +14959,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14134,5 +14965,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14143,5 +14974,5 @@
 "γραμμές. Default 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14150,5 +14981,5 @@
 "τιμή 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
@@ -14156,42 +14987,42 @@
 "2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Μετατόπιση όλων των σημείων Ανατολικά (μοίρες). Προκαθορισμένη τιμή 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Μετατόπιση όλων των σημείων Βόρεια (μοίρες). Προκαθορισμένη τιμή 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Κατεύθυνση για αναζήτηση ξηράς. Προκαθορισμένη τιμή ανατολικά."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Μέγιστο μέγεθος κάθε καταλόγου cache σε bytes. Προκαθορισμένη τιμή 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Προτιμήσεις πρόσθετου Lakewalker"
@@ -14403,5 +15234,5 @@
 msgstr "Βρόχος λήψης OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14426,5 +15257,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14441,14 +15271,22 @@
 "λεκτικό"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Άνοιμα OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14458,22 +15296,30 @@
 "δεδομένων από το OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Προσθήκη σχολίου"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Εισάγετε το σχόλιο σας"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Σημείωση ως τελειωμένου"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Επιθυμείτε κλείσιμο;"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14481,23 +15327,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Κλείσιμο"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Νέο θέμα"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Δημιουργία θέματος"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Περιγράψτε το πρόβλημα επακριβώς"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Συσχέτιση"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Παρακαλώ εισάγετε ένα όνομα χρήστη"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Άγνωστη κατάσταση θέματος"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Άνοιμα OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14519,10 +15393,10 @@
 msgstr "Άγνωστη επέκταση αρχείου: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14532,5 +15406,5 @@
 "σελίδα Ρυθμίσεις Χάρτη από τις επιλογές."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "εκτελέσιμο Firefox"
@@ -14540,37 +15414,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "φόρτωση δεδομένων από το API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "αλλαγή της επιλογής"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Απομακρυσμένος έλεγχος"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Ρυθμίσεις για το πρόσθετο Απομακρυσμένου Ελέγχου."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14579,5 +15453,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Επιτρεπώμενες ενέργειες"
@@ -14691,25 +15565,25 @@
 msgstr "Καθαρισμός διαδρομής"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Προτιμήσεις πρόσθετου Δρομολόγησης"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Ρύθμιση προτιμήσεων δρομολόγησης"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Ταχύτητα (ΧΑΩ)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14755,42 +15629,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "αυτόματο ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "αυτόματη φόρτωση πλακιδίων"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ρυθμίσεις για το πρόσθετο SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Πηγές Πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Αυτόματο ζουμ: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Αυτόματη φόρτωση Πλακιδίων: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Μέγιστο επίπεδο ζούμ: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -15022,37 +15896,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Χρήση επιπέδου σφαλμάτων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Χρήση του επιπέδου σφαλμάτων για την προβολή προβληματικών στοιχείων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Κατ΄απαίτηση"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Κατά την αποστολή"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15060,5 +15934,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Επαλήθευση δεδομένων"
@@ -15660,5 +16534,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "κτίριο"
@@ -15672,5 +16546,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -16063,9 +16937,9 @@
 msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Προτιμήσεις πρόσθετου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
@@ -16073,47 +16947,47 @@
 "πρόσθετου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Όνομα μενού"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Όνομα Μενού (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Προκαθορισμένο)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Επικάλυψη πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17652,6 +18526,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
@@ -17677,6 +18551,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17702,6 +18576,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "πρωτεύων"
@@ -17727,6 +18601,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "δευτερεύων"
@@ -17740,5 +18614,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17756,5 +18630,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "Οικιστική"
@@ -17788,6 +18662,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17821,6 +18695,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17870,5 +18744,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -18854,5 +19728,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "έλος"
@@ -20251,7 +21125,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "οδός"
@@ -20979,28 +21853,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "άθληση"
@@ -22695,4 +23569,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22727,9 +23609,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24137,7 +25019,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "ποδήλατο"
@@ -24207,7 +25089,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24233,5 +25115,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "υπόγειος"
@@ -24527,5 +25409,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24567,5 +25449,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "άλογο"
@@ -24675,4 +25557,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24710,5 +25598,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24781,11 +25669,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24848,5 +25736,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24902,7 +25790,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24973,9 +25861,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -25067,5 +25955,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25079,5 +25967,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25098,10 +25986,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25111,5 +25999,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25124,5 +26012,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "όχθη ποταμού"
@@ -25136,5 +26024,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "υδατόρρευμα"
@@ -25148,5 +26036,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "προβλήτα"
@@ -25335,13 +26223,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25403,7 +26291,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25426,10 +26314,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25465,7 +26353,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25511,6 +26399,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25524,5 +26412,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25544,5 +26432,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25556,5 +26444,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25616,7 +26504,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25633,5 +26521,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "πίστα εύκολη"
@@ -25646,5 +26534,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "πίστα μεσαία"
@@ -25659,5 +26547,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "πίστα προχορημένη"
@@ -25672,5 +26560,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25685,5 +26573,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25698,5 +26586,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "πιστα αρχαρίων"
@@ -25816,11 +26704,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25834,5 +26722,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "προβλήτα"
@@ -25846,5 +26734,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "αγωγός"
@@ -25988,13 +26876,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "αναψυχή"
@@ -26008,5 +26896,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26102,10 +26990,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26207,14 +27095,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26610,5 +27505,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26633,23 +27528,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26681,6 +27576,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26741,8 +27636,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "υγεία"
@@ -27095,26 +27990,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "κατάστημα"
@@ -27186,8 +28081,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "ξενοδοχείο"
@@ -27258,5 +28153,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27265,5 +28160,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27273,5 +28168,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27280,5 +28175,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27288,9 +28183,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "τουρισμός"
@@ -27378,14 +28273,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "ιστορικό"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27394,5 +28288,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "λατομείο"
@@ -27406,5 +28300,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -27426,5 +28320,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "λεκάνη"
@@ -27438,5 +28332,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "δάσος"
@@ -27450,5 +28344,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27471,5 +28365,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27483,5 +28377,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -27495,5 +28389,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27507,5 +28401,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27519,5 +28413,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27574,7 +28468,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "στρατιωτική"
@@ -27588,5 +28482,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -27599,5 +28493,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "κορυφή"
@@ -27612,5 +28506,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "παγετώνας"
@@ -27624,5 +28518,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -27677,8 +28571,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27692,5 +28586,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27704,5 +28598,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27716,5 +28610,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27728,5 +28622,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "λάσπη"
@@ -27740,5 +28634,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "παραλία"
@@ -27816,8 +28710,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "διαδρομή"
@@ -27840,4 +28734,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27865,7 +28800,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "όριο"
@@ -28015,11 +28955,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -28067,6 +29007,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "διεύθυνση"
@@ -28422,4 +29362,16 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί "
+#~ "ο κωδικός."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "Όνομα χρήστη OSM (e-mail)"
+
 #~ msgid "Do not show again"
 #~ msgstr "Να μην εμφανιστεί ξανά"
@@ -28639,7 +29591,4 @@
 #~ msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "Όνομα χρήστη OSM (email)"
-
 #~ msgid "Plugin already exists"
 #~ msgstr "Το πρόσθετο υπάρχει ήδη"
@@ -28690,7 +29639,4 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Εισαγωγή αρχείου TCX..."
-
-#~ msgid "Request Update"
-#~ msgstr "Αίτηση  Ενημέρωσης"
 
 #~ msgid "WMS Plugin Help"
@@ -28813,7 +29759,4 @@
 #~ msgid "Please enter a search string"
 #~ msgstr "Εισαγωγή ακολουθίας προς αναζήτηση"
-
-#~ msgid "Validate"
-#~ msgstr "Επαλήθευση"
 
 #~ msgid "Open User Page"
@@ -29037,12 +29980,6 @@
 #~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
 
-#~ msgid "API initialization failed"
-#~ msgstr "Αποτυχία αρχικοποίησης API"
-
 #~ msgid "Update Selection"
 #~ msgstr "Ενημέρωση Επιλογής"
-
-#~ msgid "Update failed"
-#~ msgstr "Αποτυχία ενημέρωσης"
 
 #~ msgid "Upload to OSM API failed"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 19246)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 19319)
@@ -7,4 +7,5 @@
 # Bruce Cowan <bcowan@fastmail.co.uk>, 2009.
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -13,5 +14,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
 "PO-Revision-Date: 2009-12-23 20:28+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -21,9 +22,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
@@ -90,9 +91,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -119,5 +120,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -125,6 +126,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -136,9 +137,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -177,5 +178,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -203,6 +203,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -301,4 +301,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Continue"
@@ -329,5 +330,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -343,7 +344,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -477,6 +481,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -555,5 +560,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -567,5 +572,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Information"
@@ -766,15 +771,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Delete"
@@ -852,6 +857,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1500,14 +1505,15 @@
 msgstr[1] "to {0} primtives"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Preferences..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Open a preferences page for global settings."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Preferences"
@@ -1653,17 +1659,17 @@
 msgstr "Help: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Status Report"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Copy to clipboard and close"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1808,33 +1814,33 @@
 msgstr "This node is not glued to anything else."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "None of these nodes are glued to anything else."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "None of this way's nodes are glued to anything else."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "The current selection cannot be used for unglueing."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Select either:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* One tagged node, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* One node that is used by more than one way, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* One node that is used by more than one way and one of those ways, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1842,5 +1848,5 @@
 "* One way that has one or more nodes that are used by more than one way, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1848,5 +1854,5 @@
 "* One way and one or more of its nodes that are used by more than one way."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1860,9 +1866,9 @@
 "own copy and all nodes will be selected."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Unglued Node"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1870,5 +1876,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2036,4 +2042,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Back"
@@ -3273,24 +3281,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferences stored on {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Could not upload preferences. Reason: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Could not load preferences from server."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3299,5 +3307,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3310,5 +3318,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3724,6 +3732,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3890,5 +3898,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3903,10 +3911,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "highway"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3914,15 +3922,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "waterway"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "landuse"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3935,6 +3943,11 @@
 msgstr[1] "{0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Public Transport"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3943,5 +3956,5 @@
 msgstr[1] "{0} members"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3983,9 +3996,19 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Connection Failed"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Connection Failed"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Unknown host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Object deleted"
@@ -4091,65 +4114,65 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Open file (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Set the language."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4161,9 +4184,9 @@
 "      Java option to increase the maximum size of allocated memory"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4173,25 +4196,25 @@
 "some data before --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Activating updated plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Loading early plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Loading plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4204,5 +4227,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4211,5 +4234,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4319,5 +4342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "User:"
@@ -5009,5 +5032,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5022,5 +5045,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5028,5 +5051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5116,5 +5139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "none"
@@ -5294,5 +5317,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5304,5 +5327,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5397,5 +5420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5404,5 +5427,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5489,13 +5512,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Add"
@@ -5626,54 +5649,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Open a list of all relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Open an editor for the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Delete the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Create a new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Create a copy of this relation and open it in another editor window"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Set the current selection to the list of selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -7010,58 +7033,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7069,58 +7092,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7128,9 +7151,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7138,5 +7161,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7144,15 +7167,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7160,9 +7183,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7171,5 +7194,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7196,9 +7219,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Basic"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7208,5 +7232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7217,5 +7241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7257,22 +7281,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7281,10 +7307,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7293,10 +7319,10 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7305,5 +7331,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7312,9 +7338,9 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Please select a value"
@@ -7342,61 +7368,57 @@
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Delete {0} relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "No relation is selected"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Select line drawing options"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Select line drawing options"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7454,5 +7476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7466,12 +7488,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "Downloading relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8110,6 +8132,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9193,6 +9216,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9282,9 +9305,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9306,4 +9328,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9743,24 +9772,24 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Files (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "File {0} is loaded yet under the name \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Error while parsing {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Could not read \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9772,34 +9801,34 @@
 "on the photo and select a timezone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Photo time (from exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Gps time (read from the above photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "I'm in the timezone of: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "No date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Open an other photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronise time from a photo of the GPS receiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9809,114 +9838,116 @@
 "Please use the requested format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Invalid date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<No GPX track loaded yet>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Open another GPX trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Correlate images with GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Correlate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Invalid timezone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Invalid offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconds: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9926,21 +9957,21 @@
 "adjust the sliders to manually match the photos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "The selected photos don't contain time information."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Photos don't contain time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -9948,17 +9979,17 @@
 "The selected GPX track doesn't contain timestamps. Please select another one."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX Track has no time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "You should select a GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "No selected GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9969,5 +10000,5 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9978,56 +10009,56 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extracting GPS locations from EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Starting directory scan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Read photos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Reading {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Unable to get canonical path for directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanning directory {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Found null file in directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10035,22 +10066,22 @@
 msgstr[1] "images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} were found to be gps tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10244,4 +10275,580 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Use global settings."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Authors"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Canal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Username"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Password"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Rotate right"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Add Properties"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Authors"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Please enter a user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Please enter a user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "API initialisation failed"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Access"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Advanced Preferences"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Please enter a user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Please enter a user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Please select at least one node or way."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "No match found for ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Close this dialogue and resume editing in JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Fetching a package of nodes from ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Warning: failed to persist preferences to ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Saving layer to ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Upload Preferences"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Request Update"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Click to remove destination"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Emergency Access Point"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Click to remove destination"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Access"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Update failed"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "string;string;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10274,5 +10881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10280,5 +10887,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10286,7 +10893,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Please select the row to delete."
@@ -10746,12 +11353,4 @@
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Keep backup files"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "When saving, keep backup files ending with a ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10790,17 +11389,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Look and Feel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Language"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Default (Auto determined)"
@@ -10867,10 +11461,19 @@
 msgstr "Configure Plugin Sites"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Cancel the updates and close the dialog"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Display Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10880,29 +11483,29 @@
 "program."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Connection Settings for the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Map Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Settings for the map projection and data interpretation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Audio Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Settings for the audio player and audio markers."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "You have to restart JOSM for some settings to take effect."
@@ -10929,91 +11532,29 @@
 msgstr "The projection {0} could not be activated. Using Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Attraction"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxy Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "The base URL for the OSM server (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Login name (e-mail) to the OSM account."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Login password to the OSM account. Leave blank to not store any password."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Base Server URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM username (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM password"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11313,4 +11854,254 @@
 msgstr "Modifier Groups"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Connection failed."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Use default"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Keep backup files"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "When saving, keep backup files ending with a ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM username (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM password"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<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>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Preferences"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Base Server URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Validate"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Current value is default."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11454,5 +12245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11504,23 +12295,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11529,16 +12326,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11546,5 +12343,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11552,5 +12349,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11788,5 +12585,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11831,5 +12628,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11877,30 +12674,30 @@
 msgstr "OK - trying again."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Starting retry {0} of {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12064,4 +12861,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "unexpected value of parameter \"index\". Got {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12360,23 +13172,28 @@
 "Couldn't connect to the osm server. Please check your internet connection."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Reading {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12759,5 +13576,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12766,5 +13583,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12774,5 +13591,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12785,5 +13602,30 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12792,5 +13634,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12799,5 +13641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12806,9 +13648,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12817,5 +13659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12828,5 +13670,5 @@
 "applet and because you didn''t load your applet from ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12837,5 +13679,5 @@
 "check your internet connection.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12844,5 +13686,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12851,10 +13693,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12863,10 +13705,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12877,5 +13719,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12888,5 +13730,5 @@
 "preferences and your internet connection.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12897,18 +13739,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12939,4 +13768,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13327,5 +14162,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13376,5 +14211,11 @@
 msgstr "CadastreGrabber: Illegal url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13383,25 +14224,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Choose from..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Select commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Choose from..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13413,13 +14252,13 @@
 "Would you like to restore F11 for grab action ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Restore grab shortcut F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM is stopped for the change to take effect."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13428,34 +14267,34 @@
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Replace original background by JOSM background colour."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Reverse grey colours (for black backgrounds)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Set background transparent."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Draw boundaries of downloaded data."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Enable automatic caching."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Max. cache size (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13473,18 +14312,18 @@
 "by this plugin."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "French cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>Value of key \"source\" when autosourcing is enabled</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13494,5 +14333,5 @@
 "preferences."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13502,44 +14341,44 @@
 "Useful for texts on dark backgrounds."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Allows multiple layers stacking"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr "Set WMS layers transparency. Right is opaque, left is transparent."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Draw a rectangle around downloaded data from WMS server."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Grab smaller images (higher quality but use more memory)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Fixed size square (default is 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Fixed size (from 25 to 1000 metres)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Oldest files are automatically deleted when this size is exceeded"
@@ -13652,5 +14491,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13658,14 +14497,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13673,14 +14512,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13688,21 +14527,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13815,28 +14654,28 @@
 msgstr "Blank Layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS layer ({0}), {1} tile(s) loaded"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Is not vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Is vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13847,47 +14686,47 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Cache Lambert Zone Error"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Use"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Please select a scheme to use."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Colour Scheme"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Please select the scheme to delete."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Use the selected scheme from the list."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Use the current colours as a new colour scheme."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Delete the selected scheme from the list."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Colour Schemes"
@@ -14052,6 +14891,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Refresh"
@@ -14281,33 +15120,33 @@
 msgstr "An unknown error has occurred"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "east"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "northeast"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "north"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "northwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "west"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "southwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "south"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "southeast"
@@ -14347,5 +15186,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14356,80 +15195,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "water"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "coastline"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maximum number of segments per way"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximum number of nodes in initial trace"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximum grey value to count as water (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Line simplification accuracy (degrees)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolution of Landsat tiles (pixels per degree)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Size of Landsat tiles (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Shift all traces to east (degrees)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Shift all traces to north (degrees)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Direction to search for land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Tag ways as"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS Layer"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maximum cache size (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maximum cache age (days)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Source text"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Maximum number of segments allowed in each generated way. Default 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14439,5 +15278,5 @@
 "lines). Default 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14447,5 +15286,5 @@
 "in the range 0-255. Default 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14455,5 +15294,5 @@
 "<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14461,45 +15300,45 @@
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Size of one landsat tile, measured in pixels. Default 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Offset all points in East direction (degrees). Default 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Offset all points in North direction (degrees). Default 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Direction to search for land. Default east."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Tag ways as water, coastline, land or nothing. Default is water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Which WMS layer to use for tracing against. Default is IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximum size of each cache directory in bytes. Default is 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Maximum age of each cached file in days. Default is 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Data source text. Default is Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "A plugin to trace water bodies on Landsat imagery."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakewalker Plugin Preferences"
@@ -14709,5 +15548,5 @@
 msgstr "OpenStreetBugs download loop"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Displays OpenStreetBugs issues"
@@ -14737,5 +15576,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14750,14 +15588,22 @@
 msgstr "Header contains several values and cannot be mapped to a single string"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Open OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Opens the OpenStreetBugs window and activates the automatic download"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14767,22 +15613,31 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Add a comment"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Enter your comment"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Common"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Mark as done"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Really close?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14792,23 +15647,51 @@
 "comment:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Close"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "New issue"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Create issue"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Describe the problem precisely"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Created at:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Please enter a user name"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Unknown issue state"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Open OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14830,10 +15713,10 @@
 msgstr "Unknown file extension: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14843,5 +15726,5 @@
 "the preferences."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox executable"
@@ -14851,37 +15734,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "load data from API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "change the selection"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "change the viewport"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "confirm all Remote Control actions manually"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "A plugin that allows JOSM to be controlled from other applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Settings for the Remote Control plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14893,5 +15776,5 @@
 "talking to the plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Permitted actions"
@@ -15005,25 +15888,25 @@
 msgstr "Clear route"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Routing Plugin Preferences"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Configure routing preferences."
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Highway type"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Speed (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Weight"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Enter weight values"
@@ -15069,42 +15952,42 @@
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "autoload tiles"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Settings for the SlippyMap plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Tile Sources"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Auto zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Autoload Tiles: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max zoom lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Fade background: "
@@ -15337,37 +16220,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Use ignore list."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Use the ignore list to suppress warnings."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Use error layer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Use the error layer to display problematic elements."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Show informational level on upload."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Show the informational tests in the upload check windows."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "On demand"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "On upload"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15377,5 +16260,5 @@
 "programs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Data validator"
@@ -15983,5 +16866,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "building"
@@ -15995,5 +16878,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "area"
@@ -16396,55 +17279,55 @@
 msgstr "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plugin Preferences"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modify list of WMS servers displayed in the WMS plugin menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Menu Name"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Enter a menu name and WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Downloader:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Overlap tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -18018,6 +18901,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
@@ -18043,6 +18926,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
@@ -18068,6 +18951,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
@@ -18093,6 +18976,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "secondary"
@@ -18106,5 +18989,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
@@ -18122,5 +19005,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "residential"
@@ -18154,6 +19037,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "service"
@@ -18187,6 +19070,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "construction"
@@ -18236,5 +19119,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "roundabout"
@@ -19220,5 +20103,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "marsh"
@@ -20617,7 +21500,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "street"
@@ -21345,28 +22228,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -23061,4 +23944,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23093,9 +23984,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "green"
@@ -24503,7 +25394,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "bicycle"
@@ -24573,7 +25464,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "foot"
@@ -24599,5 +25490,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "subway"
@@ -24893,5 +25784,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "deprecated"
@@ -24933,5 +25824,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "horse"
@@ -25041,4 +25932,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25076,5 +25973,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25147,11 +26044,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "barrier"
@@ -25214,5 +26111,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "motorroad"
@@ -25268,7 +26165,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "highway_track"
@@ -25339,9 +26236,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "rail"
@@ -25433,5 +26330,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "services"
@@ -25445,5 +26342,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "ford"
@@ -25464,10 +26361,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "turningcircle"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25477,5 +26374,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "emergency_access_point"
@@ -25490,5 +26387,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "riverbank"
@@ -25502,5 +26399,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "stream"
@@ -25514,5 +26411,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "dock"
@@ -25701,13 +26598,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "manmade"
@@ -25769,7 +26666,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "railwaypoint"
@@ -25792,10 +26689,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "otherrail"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "railover"
@@ -25831,7 +26728,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "oldrail"
@@ -25877,6 +26774,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "aeroway"
@@ -25890,5 +26787,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -25910,5 +26807,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -25922,5 +26819,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -25982,7 +26879,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "aerialway"
@@ -25999,5 +26896,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -26012,5 +26909,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -26025,5 +26922,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -26038,5 +26935,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "piste_expert"
@@ -26051,5 +26948,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -26064,5 +26961,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -26182,11 +27079,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "power"
@@ -26200,5 +27097,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "pier"
@@ -26212,5 +27109,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "pipeline"
@@ -26354,13 +27251,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "leisure"
@@ -26374,5 +27271,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "marina"
@@ -26468,10 +27365,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "amenity"
@@ -26573,14 +27470,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26976,5 +27880,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26999,23 +27903,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -27047,6 +27951,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "light_water"
@@ -27107,8 +28011,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "health"
@@ -27461,26 +28365,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "shop"
@@ -27552,8 +28456,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27624,5 +28528,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27631,5 +28535,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27639,5 +28543,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27646,5 +28550,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27654,9 +28558,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "tourism"
@@ -27744,14 +28648,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historic"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27760,5 +28663,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "quarry"
@@ -27772,5 +28675,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "landfill"
@@ -27792,5 +28695,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "basin"
@@ -27804,5 +28707,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "forest"
@@ -27816,5 +28719,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "farmyard"
@@ -27837,5 +28740,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "retail"
@@ -27849,5 +28752,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industrial"
@@ -27861,5 +28764,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "brownfield"
@@ -27873,5 +28776,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "greenfield"
@@ -27885,5 +28788,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "railland"
@@ -27940,7 +28843,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "military"
@@ -27954,5 +28857,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "cemetery"
@@ -27965,5 +28868,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "peak"
@@ -27978,5 +28881,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "glacier"
@@ -27990,5 +28893,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "volcano"
@@ -28043,8 +28946,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "natural"
@@ -28058,5 +28961,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "scrub"
@@ -28070,5 +28973,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "heath"
@@ -28082,5 +28985,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -28094,5 +28997,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "mud"
@@ -28106,5 +29009,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "beach"
@@ -28182,8 +29085,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "route"
@@ -28206,4 +29109,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28231,7 +29175,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "boundary"
@@ -28381,11 +29330,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "place"
@@ -28433,6 +29382,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "address"
@@ -28788,4 +29737,18 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "The base URL for the OSM server (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Login name (e-mail) to the OSM account."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "OSM username (e-mail)"
+
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -28980,7 +29943,4 @@
 #~ msgstr "help"
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM username (e-mail)"
-
 #~ msgid "Do not show again"
 #~ msgstr "Do not show again"
@@ -29208,12 +30168,6 @@
 #~ "move mouse.   Select: Click."
 
-#~ msgid "Validate"
-#~ msgstr "Validate"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Validate either current selection or complete dataset."
-
-#~ msgid "Request Update"
-#~ msgstr "Request Update"
 
 #~ msgid "error loading metadata"
@@ -29787,7 +30741,4 @@
 #~ msgstr "Checking whether primitive {0} is gone ..."
 
-#~ msgid "Update failed"
-#~ msgstr "Update failed"
-
 #~ msgid ""
 #~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
@@ -29918,7 +30869,4 @@
 #~ "{0}, max is {1}"
 
-#~ msgid "API initialization failed"
-#~ msgstr "API initialisation failed"
-
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removing reference from way {0}"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 19246)
+++ applications/editors/josm/i18n/po/es.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-29 16:45+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:00+0000\n"
 "Last-Translator: Juan Sebastián Marulanda <juanchito2006@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:21+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -302,4 +302,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Continuar"
@@ -330,5 +331,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -344,7 +345,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -477,6 +481,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -555,5 +560,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -567,5 +572,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Información"
@@ -766,15 +771,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Borrar"
@@ -855,6 +860,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1517,14 +1522,15 @@
 msgstr[1] "a {0} primitivas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Abrir la ventana de preferencias globales."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Preferencias"
@@ -1671,17 +1677,17 @@
 msgstr "Ayuda: : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Copiar al portapapeles y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1826,43 +1832,43 @@
 msgstr "Este nodo no está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selección actual no se puede usar para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selecione alguno:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo que sea usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nodo usado por más de una vía y una de esas vías, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Una vía que tenga un nodo o más usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1876,9 +1882,9 @@
 "seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nodo despegado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1886,5 +1892,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2055,4 +2061,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Retroceder"
@@ -3320,24 +3328,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencias guardadas en {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "No se han podido subir las preferencias. Ya que: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "No se han podido cargar las preferencias desde el servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3346,5 +3354,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3357,5 +3365,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3776,6 +3784,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3943,5 +3951,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3956,10 +3964,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "vía"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3967,15 +3975,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vía fluvial"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "uso del suelo"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3988,6 +3996,11 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Transporte público"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3996,5 +4009,5 @@
 msgstr[1] "miembros {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4036,9 +4049,19 @@
 msgstr "Conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Falló la conexión"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Falló la conexión"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Objeto borrado"
@@ -4144,65 +4167,65 @@
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir archivo (como gps en bruto si es .gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Establezca el idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4215,9 +4238,9 @@
 "utilizada."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4227,25 +4250,25 @@
 "asegúrese que carga algún dato antes de --seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Activando los complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4258,5 +4281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4265,5 +4288,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4371,5 +4394,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Usuario:"
@@ -5080,5 +5103,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5093,5 +5116,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5099,5 +5122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5190,5 +5213,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "ninguno"
@@ -5368,5 +5391,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5378,5 +5401,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5473,5 +5496,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5480,5 +5503,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5562,13 +5585,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Añadir"
@@ -5700,54 +5723,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -7084,58 +7107,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7143,58 +7166,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7202,9 +7225,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7212,5 +7235,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7218,15 +7241,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7234,9 +7257,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7245,5 +7268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7270,9 +7293,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Básico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7282,5 +7306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7291,5 +7315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7331,22 +7355,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7355,10 +7381,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7367,10 +7393,10 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7379,5 +7405,5 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7386,9 +7412,9 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
@@ -7417,61 +7443,57 @@
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Eliminar {0} relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "No se seleccionó ninguna relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Seleccione las opciones de dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Seleccione las opciones de dibujo de línea"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7529,5 +7551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7541,12 +7563,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Cargando padres de la relación {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8177,6 +8199,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9251,6 +9274,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9336,9 +9359,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9360,4 +9382,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9800,24 +9829,24 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Archivos GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "El archivo {0} ya está cargado con el nombre \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Error mientras se analizaba sintácticamente {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "No se pudo leer \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9829,34 +9858,34 @@
 "lee en la foto y seleccione una zona horaria<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Hora de la foto (desde exif)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Hora del Gps (leída desde la foto tomada): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/aaaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Yo estoy en la zona horaria de: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Sin fecha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Abrir otra foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "sincronizar el tiempo de una foto con el receptor GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9866,114 +9895,116 @@
 "Por favor, utilice el formato requerido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Fecha no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<La traza GPX no está cargada aún>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "Traza GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Abrir otra traza gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Estimación automática"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Ajuste:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Correlacionar las imágenes con la traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Correlación"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Zona horaria no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Desplazamiento inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zona horaria: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Segundos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9984,13 +10015,13 @@
 "manual."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Ajuste de fotografías a traza fallido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Ajustar zona horaria y la diferencia temporal"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
@@ -9998,9 +10029,9 @@
 "fueron tomadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Las fotografías no contiene información horaria"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10009,17 +10040,17 @@
 "seleccione otra."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "La traza GPX no posee información horaria"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Debe seleccionar una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "No se ha seleccionado una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10030,5 +10061,5 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10039,56 +10070,56 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrayendo localizaciones GPS del EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Iniciando escaneo del directorio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Uno de los archivos seleccionados era nulo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Leyendo fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leyendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Imposible obtener ruta apropiada para el directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Escaneando directorio {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Encontrado archivo nulo en el directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error mientras se obtenían archivos del directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10096,22 +10127,22 @@
 msgstr[1] "imagenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "Se encontraron {0} geoetiquetadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10306,4 +10337,590 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Usar las preferencias globales"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autores"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Clic para anular la fusión de nodos"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Canal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nombre de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Contraseña"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Rotar hacia la derecha"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Añadir propiedades"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autores"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Por favor, introduzca su nombre de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Por favor, introduzca su nombre de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Fallo en la inicialización del API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Acceso"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Preferencias avanzadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Introduzca la expresión de búsqueda"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Por favor, introduzca su nombre de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Por favor, introduzca su nombre de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Haga clic para cancelar la operación actual"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Por favor, seleccione al menos un nodo o vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "No se encontraron coincidencias para \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Cerrar el diálogo y crear un nuevo nodo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Obteniendo un conjunto de nodos de ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, fuzzy, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Cargando fuentes de estilos desde ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Subir preferencias"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Referencia de la torre"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Solicitar actualización"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas y "
+"las suyas</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurante"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Haga click para eliminar el destino"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Punto de acceso para emergencias"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Haga click para eliminar el destino"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Acceso"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Actualización fallida"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>El servidor OSM <br>''{0}''<br>informa de un error de servidor interno."
+"<br>Esto suele ser un problema temporal. Inténtelo de nuevo más tarde, por "
+"favor.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "cadena;cadena;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10339,5 +10956,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10345,5 +10962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10351,7 +10968,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Por favor, seleccione la fila a borrar"
@@ -10827,12 +11444,4 @@
 msgstr "Datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Conservar archivos de copia de seguridad"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Al guardar, conserve los archivos de backup que terminen en ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10871,17 +11480,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Visualización y comportamiento"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Por defecto (determinado automáticamente)"
@@ -10948,10 +11552,20 @@
 msgstr "Configurar los sitios de complementos"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Cerrar el diálogo y crear un nuevo nodo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Opciones de visualización"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10959,29 +11573,29 @@
 msgstr "Varios ajustes que manejan la presentación visual del programa."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Ajustes de la conexión"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Configuración del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Ajustes del mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ajustes para la proyección del mapa y la interpretación de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Configuración de audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Configuración del audio player y de los marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto"
@@ -11008,95 +11622,29 @@
 msgstr "No se ha podido activar la proyección {0}. Usando Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr "Sin proxy"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr "Configurar manualmente un proxy HTTP"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr "Utilizar un proxy SOCKS"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-"Advertencia: JOSM está configurado para utilizar servidores proxy desde las "
-"preferencias del sistema, pero la JVM no está configurado para recuperarlos. "
-"Restablezca la preferencias a \"Sin proxy\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Atracción"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Configuración del proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "La URL base del servidor OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar ninguna "
-"clave."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL base del servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "Nombre de usuario OSM (correo-e)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Contraseña OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>ADVERTENCIA: La clave es almacena en texto plano en el archivo de "
-"preferencias.<br> La contraseña es transferida en texto plano al servidor, "
-"codificada en la URL.<br><b>No utilice claves valiosas.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11398,4 +11946,259 @@
 msgstr "Grupos de modificadores"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "¿URL no válida?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Fallo al abrir una conexión con el servidor remoto<br>''{0}''.<br>Por "
+"favor, compruebe su conexión de Internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Conexión fallida."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Usar por defecto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Conservar archivos de copia de seguridad"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Al guardar, conserve los archivos de backup que terminen en ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Nombre de usuario OSM (correo electrónico)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Contraseña OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>ADVERTENCIA: La clave es almacena en texto plano en el archivo de "
+"preferencias.<br> La contraseña es transferida en texto plano al servidor, "
+"codificada en la URL.<br><b>No utilice claves valiosas.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Preferencias"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL base del servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Validar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "El valor actual es el de por defecto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Por favor, reinicia JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr "Sin proxy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr "Configurar manualmente un proxy HTTP"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr "Utilizar un proxy SOCKS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+"Advertencia: JOSM está configurado para utilizar servidores proxy desde las "
+"preferencias del sistema, pero la JVM no está configurado para recuperarlos. "
+"Restablezca la preferencias a \"Sin proxy\"."
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11539,5 +12342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11589,23 +12392,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11614,16 +12423,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11631,5 +12440,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11637,5 +12446,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11875,5 +12684,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11917,5 +12726,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11963,30 +12772,30 @@
 msgstr "OK - intentando de nuevo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Reintentando {0} de {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "El conjunto de cambios actual es nulo. Los datos no se pueden subir."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Código={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12153,4 +12962,19 @@
 msgstr "Analizando la lista de cambios..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12448,20 +13272,20 @@
 "conexión a Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "La etiqueta XML <user> está perdida."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Atributo persido ''{0}'' en la etiqueta XML ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
@@ -12469,4 +13293,9 @@
 "Valor ilegal para el atributo ''{0}'' en la etiqueta XML ''{1}''. Obtenido "
 "{2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Leyendo conjunto de cambios {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12859,5 +13688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12869,5 +13698,5 @@
 "Internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12881,5 +13710,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12892,5 +13721,32 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html> Autentificación en el proxy HTTP ''{0}'' fallida. Por favor, "
+"introduzca un nombre de usuario y una contraseña válida.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12899,5 +13755,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12908,5 +13764,5 @@
 "debido a que ya está cerrando en {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12917,9 +13773,9 @@
 "error (sin traducir):<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>El servidor informa de que ha detectado un conflicto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12930,5 +13786,5 @@
 "que ya se ha cerrado en  {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12941,5 +13797,5 @@
 "miniaplicacióin <br> y no lo ha cargado desde ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12950,5 +13806,5 @@
 "favor, compruebe su conexión de Internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12959,5 +13815,5 @@
 "con la transferencia de datos<br>Detalles (sin traducir): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12969,10 +13825,10 @@
 "favor.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "El servidor OSM ''{0}'' informa de una mala solicitud.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12984,10 +13840,10 @@
 "exportado proporcionado por la comunidad de OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Mensaje de error (sin traducir): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12998,5 +13854,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13006,5 +13862,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13015,18 +13871,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13054,4 +13897,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13457,5 +14306,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13506,5 +14355,11 @@
 msgstr "CadastreGrabber: URL Ilegal."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13513,25 +14368,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Elegir desde..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Seleccionar comuna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Elegir desde..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13540,13 +14393,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM está detenido para que el cambio surta efecto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13554,5 +14407,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
@@ -13560,30 +14413,30 @@
 "JOSM"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Invertir escala de grises (para fondos de pantalla negros)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Fijar fondo de pantalla transparante"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Dibujar límites de los datos descargados."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Activar caché automático"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Tamaño máximo de caché (en MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13601,9 +14454,9 @@
 "creado mediante este componente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS del catastro francés"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13611,10 +14464,10 @@
 "activo</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Fuente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13624,5 +14477,5 @@
 "preferencias de JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13632,9 +14485,9 @@
 "intermedios. Útil para los textos sobre fondos oscuros."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Permitir múltiples capas apiladas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13642,5 +14495,5 @@
 "transparente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
@@ -13648,32 +14501,32 @@
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Graba las imágenes más pequeñas (mejor calidad pero mayor uso de memoria)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Fijar tamaño del cuadrado (por defecto 100 m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Tamaño fijado (desde 25 a 100 m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13789,5 +14642,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13795,14 +14648,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13810,14 +14663,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13825,21 +14678,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Este"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Norte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13952,28 +14805,28 @@
 msgstr "Capa vacía"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "No está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Tamaño de la imagen raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13984,47 +14837,47 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Error en la zona Lambert  de la caché"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Uso"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Por favor, seleccione un esquema para ser utilizado"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Esquema de color"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Por favor, seleccione el esquema que quiere eliminar"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Utilizar el esquema seleccionado de la lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Utilizar los colores actuales como un nuevo esquema de color."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Eliminar el esquema seleccionado de la lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Esquemas de color"
@@ -14189,6 +15042,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Actualizar"
@@ -14418,33 +15271,33 @@
 msgstr "A ocurrido un error desconocido"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "este"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "noreste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "norte"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "noroeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "oeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "suroeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "sur"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "sureste"
@@ -14484,5 +15337,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14493,81 +15346,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "lámina de agua"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "línea de costa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "tierra"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Máximo número de sergmento por vía"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Máximo nudo de nodos en un trazo inicial"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valor máximo de gris par aque cuente como agua (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Precisión en la simplificación de línea (grados)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolución de las teselas del Landsat (píxeles por grado)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Tamaño de las teselas del Landsat (píxeles)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Dirigir todas las trazas hacia el Este (grados)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Dirigir todas las trazas hacia el Norte (grados)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Dirección para buscar por la tierra"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Etiquetar vías como"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Capa WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Tamaño máximo del caché (Mb)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Antigüedad máxima del caché (días)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Texto sobre la fuente"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14577,5 +15430,5 @@
 "Por defecto 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14585,5 +15438,5 @@
 "1). Puede estar entre el rango 0-255. Por defecto 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14594,5 +15447,5 @@
 "0,0003 por defecto."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14601,47 +15454,47 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Tamaño de una tesela Landsat, medido  en píxeles. Por defecto 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Trasladar todos los puntos en dirección Este (por defecto 0 grados)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Trasladar todos los puntos en dirección Norte (por defecto 0 grados)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Búsqueda de dirección en la tierra (por defecto Este)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Etiquetar vías como agua, costa, tierra o nada. Por defecto es agua."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Capa de WMS desde la que trazar. Por defecto IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Tamaño máximo de cada directorio cache in bytes. Por defecto 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Edad máxima en días de cada archivo en caché. El valor por defecto es 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Texto sobre la fuente de datos. Por defecto es Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 "Un componente para localizar las láminas de agua en las imágenes Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Preferecnias de Lakewalker Plugin"
@@ -14856,5 +15709,5 @@
 msgstr "Bucle de descarga de OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Mostar cuestiones de OpenStreetBug"
@@ -14884,5 +15737,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14899,14 +15751,22 @@
 "cadena"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Abrir OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Abrir la ventana de OpenStreetBug y activar la descarga automática"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14916,22 +15776,31 @@
 "datos de OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Añadir un comentario"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Introduce tu comentario"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Marcar como hecho"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "¿Está seguro que desea cerrar?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14941,23 +15810,51 @@
 "<br><br>Puedes añadir una comentario opcional:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Cerrar"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nueva cuestión"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Crear cuestión"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Describa el problema con precisión"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Creado en:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Por favor, introduzca su nombre de usuario"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Estado de la cuestión desconocida"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Abrir OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14979,10 +15876,10 @@
 msgstr "Extensión de archivos desconocida: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14992,5 +15889,5 @@
 "pestaña Configuraciones del Mapa del menú Preferencias."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Ejecutable Firefox"
@@ -15000,38 +15897,38 @@
 msgstr "PicLayer"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "carga de datos desde el API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "crear nuevos objetos"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "cambiar la selección"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "modificar vista general"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "confirmar todas las acciones manuales de control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un componente que permite a JOSM ser controlado por otras aplicaciones."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Ajustes para el componente Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15043,5 +15940,5 @@
 "comunicarse con el complemento."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Acciones permitidas"
@@ -15155,25 +16052,25 @@
 msgstr "Borrar ruta"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Preferencias del componente Routing"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Configurar las preferencias de enrutamiento"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Tipo de vial"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Velocidad (km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Impedancia"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Introduzca el peso de los valores"
@@ -15219,42 +16116,42 @@
 msgstr "imagen "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "zoom automático"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "Carga automática de teselas"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ajustes para el complmento SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Fuentes de teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Zoom automático: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Carga automática de teselas: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr "Nivel mínimo de zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max. nivel de zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Fondo de pantalla apagado: "
@@ -15493,25 +16390,25 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Usar lista de omisiones"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Usar la lista de omisiones para suprimir advertencias"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Utilizar la capa de errores"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Utilizar la capa de errores para mostrar elementos problemáticos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Mostrar información sobre la subida de datos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
@@ -15519,13 +16416,13 @@
 "subida de datos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "A petición"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Al envío"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15535,5 +16432,5 @@
 "por los usuarios y los programas de edición."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Validador de datos"
@@ -16159,5 +17056,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "edificio"
@@ -16171,5 +17068,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "área"
@@ -16592,9 +17489,9 @@
 msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Preferencias del componente WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
@@ -16605,47 +17502,47 @@
 "para añadirlo a la lista superior de servidores mostrados)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Nombre del menú"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "Dirección URL del servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Nombre del menú (por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "Dirección URL del servicio WMS (Por defecto)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Introduce un nombre y una dirección para el servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Copiar la/s seleccionada/s por defecto"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Por favor, seleccione al menos una fila para copiar"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Gestor de descarga:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Superposición de teselas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "% hacia el Este"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "% hacia el Norte"
@@ -18241,6 +19138,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autopista"
@@ -18266,6 +19163,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "Carretera principal"
@@ -18291,6 +19188,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "vía primaria"
@@ -18316,6 +19213,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "vía secundaria"
@@ -18329,5 +19226,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "carretera local"
@@ -18345,5 +19242,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "calle urbana"
@@ -18377,6 +19274,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "vía de servicio"
@@ -18410,6 +19307,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "en construcción"
@@ -18459,5 +19356,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rotonda"
@@ -19444,5 +20341,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "marísma"
@@ -20841,7 +21738,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "calle"
@@ -21569,28 +22466,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "deporte"
@@ -23285,4 +24182,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23317,9 +24222,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "zona verde"
@@ -24735,7 +25640,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "bicicleta"
@@ -24805,7 +25710,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "pie"
@@ -24831,5 +25736,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro"
@@ -25125,5 +26030,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "obsoleto"
@@ -25165,5 +26070,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "caballo"
@@ -25273,4 +26178,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25308,5 +26219,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25379,11 +26290,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "barrera"
@@ -25446,5 +26357,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "Autovía"
@@ -25500,7 +26411,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "pista"
@@ -25571,9 +26482,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "ferrocarril"
@@ -25665,5 +26576,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "servicios"
@@ -25677,5 +26588,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "vado"
@@ -25696,10 +26607,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "círculo de giro"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25709,5 +26620,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "Punto de acceso de emergencias"
@@ -25722,5 +26633,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "ribera"
@@ -25734,5 +26645,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "arroyo"
@@ -25746,5 +26657,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "muelle"
@@ -25933,13 +26844,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "hecho por el hombre"
@@ -26001,7 +26912,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -26024,10 +26935,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "otros ferrocarriles"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "paso con más de un cruce ferroviario"
@@ -26063,7 +26974,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "vía muerta"
@@ -26109,6 +27020,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "aerovía"
@@ -26122,5 +27033,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -26142,5 +27053,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "pista (oscuro)"
@@ -26154,5 +27065,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "pista (claro)"
@@ -26214,7 +27125,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "pista de rodadura"
@@ -26231,5 +27142,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "pista fácil"
@@ -26244,5 +27155,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "pista intermedia"
@@ -26257,5 +27168,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "pista avanzada"
@@ -26270,5 +27181,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "pista para expertos"
@@ -26283,5 +27194,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "pista de estilo libre"
@@ -26296,5 +27207,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "pista para iniciados"
@@ -26414,11 +27325,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "energía"
@@ -26432,5 +27343,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "muelle"
@@ -26444,5 +27355,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "tubería"
@@ -26586,13 +27497,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "ocio"
@@ -26606,5 +27517,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "puerto deportivo"
@@ -26700,10 +27611,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "servicios"
@@ -26805,14 +27716,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27208,5 +28126,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27231,23 +28149,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "equipamiento lumínico"
@@ -27279,6 +28197,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "agua (claro)"
@@ -27339,8 +28257,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "salud"
@@ -27693,26 +28611,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "tienda"
@@ -27784,8 +28702,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27856,5 +28774,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27863,5 +28781,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27871,5 +28789,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27878,5 +28796,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27886,9 +28804,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turismo"
@@ -27976,14 +28894,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "patrimonio histórico"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27992,5 +28909,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "cantera"
@@ -28004,5 +28921,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "vertedero"
@@ -28024,5 +28941,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "cuenca"
@@ -28036,5 +28953,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "plantación forestal"
@@ -28048,5 +28965,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -28069,5 +28986,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "venta al por menor"
@@ -28081,5 +28998,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industrial"
@@ -28093,5 +29010,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -28105,5 +29022,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "área rururbana"
@@ -28117,5 +29034,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -28172,7 +29089,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "zona militar"
@@ -28186,5 +29103,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "cementerio"
@@ -28197,5 +29114,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "pico"
@@ -28210,5 +29127,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "glaciar"
@@ -28222,5 +29139,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "volcán"
@@ -28275,8 +29192,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "espacio natural"
@@ -28290,5 +29207,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "matorral"
@@ -28302,5 +29219,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "monte"
@@ -28314,5 +29231,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "área forestal"
@@ -28326,5 +29243,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "lodazal"
@@ -28338,5 +29255,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "playa"
@@ -28414,8 +29331,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "ruta"
@@ -28438,4 +29355,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28463,7 +29421,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "frontera"
@@ -28613,11 +29576,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "lugar"
@@ -28665,6 +29628,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "dirección"
@@ -29020,4 +29983,19 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "La URL base del servidor OSM (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar "
+#~ "ninguna clave."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "Nombre de usuario OSM (correo-e)"
+
 #~ msgid "Move"
 #~ msgstr "Mover"
@@ -29149,7 +30127,4 @@
 #~ msgstr ""
 #~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nombre de usuario OSM (correo electrónico)"
 
 #~ msgid "current delta: {0}s"
@@ -29466,7 +30441,4 @@
 #~ msgstr "abrir imágenes con AgPifoJ..."
 
-#~ msgid "Request Update"
-#~ msgstr "Solicitar actualización"
-
 #~ msgid "Show Tile Status"
 #~ msgstr "Mostrar estado de la tesela"
@@ -29496,7 +30468,4 @@
 #~ "Zoom: Rueda del ratón o doble click. Mover el mapa: mantenga apretado el "
 #~ "botón derecho del ratón y mueva el ratón. Seleccionar: Click"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
 
 #~ msgid "requested: {0}"
@@ -29971,7 +30940,4 @@
 #~ msgstr "Deshaciando borrado de relación..."
 
-#~ msgid "Update failed"
-#~ msgstr "Actualización fallida"
-
 #~ msgid "Selection too big"
 #~ msgstr "Selección demasiado grande"
@@ -30062,7 +31028,4 @@
 #~ "tarde."
 
-#~ msgid "API initialization failed"
-#~ msgstr "Fallo en la inicialización del API"
-
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "el parámetro '{0}' no debe ser nulo"
@@ -30296,4 +31259,8 @@
 #~ "Error: fallo al añadir credenciales de autentificación a la conexión."
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr ""
+#~ "El conjunto de cambios actual es nulo. Los datos no se pueden subir."
+
 #~ msgid "Use an open changeset"
 #~ msgstr "Usar un nuevo conjunto de cambios"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 19246)
+++ applications/editors/josm/i18n/po/et.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 20:35+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-04 10:50+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Loon kasutajaliidest"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -295,4 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Jätka"
@@ -323,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -337,7 +338,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -469,6 +473,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -547,5 +552,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -559,5 +564,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Info"
@@ -630,10 +635,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr ""
+msgstr "Muutustekogumite haldur"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
 msgid "Toggle visibility of Changeset Manager window"
-msgstr ""
+msgstr "Muutustekogumi halduri akna nähtavuse lülitamine"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
@@ -756,15 +761,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Kustuta"
@@ -842,6 +847,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -916,9 +921,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
 msgid "Toggle fullscreen view"
-msgstr "Täisekraanvaate sisse-/väljalülitamine"
+msgstr "Täisekraanvaate lülitamine"
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle Fullscreen view"
-msgstr "Lülita täisekraanvaade"
+msgstr "Täisekraanvaate lülitamine"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -1341,14 +1346,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
 msgid "Open file"
-msgstr ""
+msgstr "Faili avamine"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Avan 1 faili..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
 #, java-format
 msgid "Opening {0} files..."
-msgstr ""
+msgstr "Avan {0} faili..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1480,6 +1485,6 @@
 msgid "Pasting {0} tag"
 msgid_plural "Pasting {0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kleebin {0} sildi"
+msgstr[1] "Kleebin {0} silti"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
@@ -1490,14 +1495,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Eelistused..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Ava eelistuse leht, et muuta globaalseid sätteid"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Eelistused"
@@ -1641,17 +1647,17 @@
 msgstr "Abi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Staatus"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopeeri puhvrisse ja sulge."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1682,5 +1688,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90
 msgid "Are you sure?"
-msgstr ""
+msgstr "Kas oled kindel?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
@@ -1792,34 +1798,34 @@
 msgstr "See on üksik sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ükski neist sõlmedest ei ole millegi küljes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Praegust valikut ei saa liimist lahtivõtmiseks kasutada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vali miski:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* üks sildiga sõlm või"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* üks sõlm, mis on kasutusel rohkem kui ühes tees või"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1828,5 +1834,5 @@
 "teedest"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1835,5 +1841,5 @@
 "ühes neist teedest"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1846,9 +1852,9 @@
 "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Lahtisulatatud sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1856,5 +1862,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1908,5 +1914,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Uuenda muudetud"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -1917,5 +1923,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
 msgid "No current dataset found"
-msgstr ""
+msgstr "Jooksvat andmekogumit ei leitud"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
@@ -1970,5 +1976,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
 msgid "Upload selection"
-msgstr ""
+msgstr "Lae valik üles"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
@@ -2019,4 +2025,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Tagasi"
@@ -2111,5 +2119,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144
 msgid "No data found in this area."
-msgstr ""
+msgstr "Selles alas ei leitud andmeid."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
@@ -3197,24 +3205,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3223,5 +3231,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3232,5 +3240,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3644,6 +3652,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3809,5 +3817,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3822,10 +3830,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3833,15 +3841,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3854,6 +3862,11 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Avalik transport"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3862,9 +3875,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
-msgstr ""
+msgstr "Muutustekogum {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
@@ -3902,9 +3915,19 @@
 msgstr "Vastuolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "API initsialiseerimine ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "API initsialiseerimine ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Tundmatu host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4010,65 +4033,65 @@
 msgstr "Salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4077,9 +4100,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4087,25 +4110,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktiveerin uuendatud pistikrakendused"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Varaste pistikrakendustel laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Pistikrakenduste laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4118,5 +4141,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4125,5 +4148,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4231,5 +4254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4887,5 +4910,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4900,5 +4923,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4906,5 +4929,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4994,5 +5017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr ""
@@ -5172,5 +5195,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5182,5 +5205,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5219,5 +5242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Muutustekogumid"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:262
@@ -5241,5 +5264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:402
 msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Suleb valitud avatud muutustekogumid"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:433
@@ -5275,5 +5298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5282,5 +5305,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5362,13 +5385,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Lisa"
@@ -5499,54 +5522,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Seosed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Seosed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Ava toimetajas valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Kustuta valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Loo uus seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6882,58 +6905,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6941,58 +6964,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7000,9 +7023,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7010,5 +7033,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7016,15 +7039,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7032,9 +7055,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7043,5 +7066,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7068,9 +7091,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Lihtne"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7080,5 +7104,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7089,5 +7113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7129,22 +7153,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7153,10 +7179,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7165,10 +7191,10 @@
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7177,5 +7203,5 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7184,9 +7210,9 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
@@ -7214,57 +7240,55 @@
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Valik"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Konfliktne relatsioon"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
 msgstr ""
@@ -7322,5 +7346,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7334,12 +7358,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Relatsiooni {2} vanemate laadimine"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -7950,6 +7974,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8991,6 +9016,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9047,5 +9072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Vali üleslaetavad objektid"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
@@ -9076,9 +9101,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9100,4 +9124,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9142,5 +9173,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52
 msgid "Objects to add:"
-msgstr "Objektid lisada:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58
@@ -9156,6 +9187,6 @@
 msgid "{0} object to add:"
 msgid_plural "{0} objects to add:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekt lisada:"
+msgstr[1] "{0} objekti lisada:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104
@@ -9163,6 +9194,6 @@
 msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekt muuta:"
+msgstr[1] "{0} objekti muuta:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
@@ -9170,6 +9201,6 @@
 msgid "{0} object to delete:"
 msgid_plural "{0} objects to delete:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekt kustutada:"
+msgstr[1] "{0} objekti kustutada:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
@@ -9529,24 +9560,24 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Viga {0} parsimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei suutnud lugeda \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9555,34 +9586,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9590,114 +9621,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9705,38 +9738,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9745,5 +9778,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9752,56 +9785,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9809,22 +9842,22 @@
 msgstr[1] "pildid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10010,4 +10043,574 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Kasuta kraade kümnendsüsteemis."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autorid"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Vajuta, katkestamaks sõlmede liitmist"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "looduslik"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Kasutajanimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Salasõna"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+msgid "Granted rights"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Lisa seaded"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autorid"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Palun sisesta otsingu tekst"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "API initsialiseerimine ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+msgid "Advanced OAuth parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Palun vali vähemalt üks tee."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+msgid "Please enter an Access Token Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Palun vali vähemalt üks sõlm või tee."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Sule dialoogiaken ja katkesta allalaadimine"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Sulge dialoog ja loo uus sõlm"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Üleslaadimise valikud"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Kaubandus"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restoran"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Hädaabi tugijaam"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Jalgpall"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Uuendamine ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "tekst;tekst;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10039,5 +10642,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10045,5 +10648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10051,7 +10654,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Palun vali rida kustutamiseks"
@@ -10486,12 +11089,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10530,17 +11125,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Välimus ja tunnetus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr ""
@@ -10607,10 +11197,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Sulge dialoog ja loo uus sõlm"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+msgid "Save the preferences and close the dialog"
+msgstr ""
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Vaateseadistused"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10618,29 +11217,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Ühenduse sätted"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Kaardi seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama."
@@ -10667,86 +11266,28 @@
 msgstr "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM parool"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Vaatamisväärsus"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#, fuzzy
+msgid "Proxy settings"
+msgstr "Kaardi seaded"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11022,4 +11563,247 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Laadimine OSM API-le ebaõnnestus"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM kasutajanimi (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM parool"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Eelistused"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "OSM serveri failid"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "Väärtus"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+msgid "The current value isn't a valid URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11163,5 +11947,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11213,23 +11997,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11238,16 +12028,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11255,5 +12045,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11261,5 +12051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11493,5 +12283,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11535,5 +12325,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11581,30 +12371,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11763,4 +12553,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12056,22 +12861,26 @@
 msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+msgid "Reading user info ..."
 msgstr ""
 
@@ -12447,5 +13256,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12454,5 +13263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12462,5 +13271,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12470,5 +13279,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12477,5 +13311,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12484,5 +13318,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12491,9 +13325,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12502,5 +13336,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12510,5 +13344,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12517,5 +13351,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12524,5 +13358,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12531,10 +13365,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12543,10 +13377,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12557,5 +13391,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12565,5 +13399,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12574,18 +13408,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12612,4 +13433,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -12996,5 +13823,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13045,5 +13872,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13052,25 +13885,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13079,13 +13910,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13093,34 +13924,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13132,18 +13963,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13151,5 +13982,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13157,44 +13988,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13305,5 +14136,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13311,14 +14142,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13326,14 +14157,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13341,21 +14172,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13464,28 +14295,28 @@
 msgstr "Tühi kiht"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13494,47 +14325,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13696,6 +14527,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr ""
@@ -13922,33 +14753,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr ""
@@ -13988,5 +14819,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -13997,80 +14828,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14078,5 +14909,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14084,5 +14915,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14090,50 +14921,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14343,5 +15174,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14366,5 +15197,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14379,14 +15209,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14394,22 +15232,31 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Avalik maa"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14417,23 +15264,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Sulge"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Alade loomine"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreetMap"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14455,10 +15330,10 @@
 msgstr "Tundmatu faililaiend: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14466,5 +15341,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14474,37 +15349,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14513,5 +15388,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14625,25 +15500,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14689,42 +15564,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -14954,37 +15829,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -14992,5 +15867,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15590,5 +16465,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr ""
@@ -15602,5 +16477,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -15992,55 +16867,55 @@
 msgstr "Ava tühi WMS kiht andmete laadimiseks failist"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17574,6 +18449,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17599,6 +18474,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17624,6 +18499,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr ""
@@ -17649,6 +18524,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr ""
@@ -17662,5 +18537,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17678,5 +18553,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr ""
@@ -17710,6 +18585,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17743,6 +18618,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17792,5 +18667,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr ""
@@ -18776,5 +19651,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20173,7 +21048,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "tänav"
@@ -20901,28 +21776,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr ""
@@ -22617,4 +23492,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22649,9 +23532,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "roheala"
@@ -24059,7 +24942,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "jalgrattaga"
@@ -24129,7 +25012,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "jalgsi"
@@ -24155,5 +25038,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metroo"
@@ -24449,5 +25332,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -24489,5 +25372,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "hobused"
@@ -24597,4 +25480,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24632,5 +25521,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24703,11 +25592,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24770,5 +25659,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24824,7 +25713,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "teerada"
@@ -24895,9 +25784,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "raudtee"
@@ -24989,5 +25878,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "teenused"
@@ -25001,5 +25890,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25020,10 +25909,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "tagasipööramisring"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25033,5 +25922,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25046,5 +25935,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "jõekallas"
@@ -25058,5 +25947,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "oja"
@@ -25070,5 +25959,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "dokk"
@@ -25257,13 +26146,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -25325,7 +26214,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25348,10 +26237,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "muu rööbastee"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "ülarelss"
@@ -25387,7 +26276,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "kasutamata raudtee"
@@ -25433,6 +26322,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "aeronautika"
@@ -25446,5 +26335,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "lennuterminal"
@@ -25466,5 +26355,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "helikopterid"
@@ -25478,5 +26367,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -25538,7 +26427,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "trosstransport"
@@ -25555,5 +26444,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "suusanõlv lihtne"
@@ -25568,5 +26457,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "suusanõlv keskmine"
@@ -25581,5 +26470,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "suusanõlv edasijõudnutele"
@@ -25594,5 +26483,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25607,5 +26496,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "suusanõlv klassita"
@@ -25620,5 +26509,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "suusanõlv algajale"
@@ -25738,11 +26627,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "elektrivarustus"
@@ -25756,5 +26645,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "kai"
@@ -25768,5 +26657,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "torujuhe"
@@ -25910,13 +26799,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "puhkealad"
@@ -25930,5 +26819,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "paadisadam"
@@ -26024,10 +26913,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "mugavused"
@@ -26129,14 +27018,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "autohooldus"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26532,5 +27428,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26555,23 +27451,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "muud teenused"
@@ -26603,6 +27499,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "vesi"
@@ -26663,8 +27559,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "tervishoid"
@@ -27017,26 +27913,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "pood"
@@ -27108,8 +28004,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotell"
@@ -27180,5 +28076,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27187,5 +28083,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27195,5 +28091,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27202,5 +28098,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27210,9 +28106,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turism"
@@ -27300,14 +28196,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "alalooline"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27316,5 +28211,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "kivimurd"
@@ -27328,5 +28223,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "prügimägi"
@@ -27348,5 +28243,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "tehisjärv"
@@ -27360,5 +28255,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "kultuurmets"
@@ -27372,5 +28267,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "taluõu"
@@ -27393,5 +28288,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "kaubandus"
@@ -27405,5 +28300,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "tööstus"
@@ -27417,5 +28312,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -27429,5 +28324,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -27441,5 +28336,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -27496,7 +28391,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "militaarala"
@@ -27510,5 +28405,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "kalmistu"
@@ -27521,5 +28416,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "mäetipp"
@@ -27534,5 +28429,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "liustik"
@@ -27546,5 +28441,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulkaan"
@@ -27599,8 +28494,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "looduslik"
@@ -27614,5 +28509,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "põõsastik"
@@ -27626,5 +28521,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "nõmm"
@@ -27638,5 +28533,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27650,5 +28545,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "muda"
@@ -27662,5 +28557,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "rand"
@@ -27738,8 +28633,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "teekond"
@@ -27762,4 +28657,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27787,7 +28723,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "piir"
@@ -27937,11 +28878,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "koht"
@@ -27989,6 +28930,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "aadress"
@@ -28398,7 +29339,4 @@
 #~ msgstr "Objekt"
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kasutajanimi (email)"
-
 #~ msgid "Do not show again"
 #~ msgstr "Rohkem ei näidata"
@@ -28643,7 +29581,4 @@
 #~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
 
-#~ msgid "API initialization failed"
-#~ msgstr "API initsialiseerimine ebaõnnestus"
-
 #~ msgid "Update Selection"
 #~ msgstr "Uuenda valik"
@@ -28654,7 +29589,4 @@
 #~ msgid "Conflict detected"
 #~ msgstr "Avastatud konflikt"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Laadimine OSM API-le ebaõnnestus"
 
 #~ msgid "Primitive already deleted"
@@ -28668,7 +29600,4 @@
 #~ msgid "No data"
 #~ msgstr "Andmeid pole"
-
-#~ msgid "Update failed"
-#~ msgstr "Uuendamine ebaõnnestus"
 
 #~ msgid "Edit Properties"
@@ -28707,2 +29636,5 @@
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Ei suutnud lugeda \"{0}\""
+
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida."
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 19246)
+++ applications/editors/josm/i18n/po/fi.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,7 +12,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 19:53+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-04 01:30+0000\n"
+"Last-Translator: Teemu Koskinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -295,4 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Jatka"
@@ -323,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -337,7 +338,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -471,6 +475,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -549,5 +554,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -561,5 +566,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Tiedot"
@@ -632,5 +637,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr ""
+msgstr "Muutoskokoelmien hallinta"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
@@ -757,15 +762,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Poista"
@@ -843,6 +848,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1340,14 +1345,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
 msgid "Open file"
-msgstr ""
+msgstr "Avaa tiedosto"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Avataan 1 tiedosto..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
 #, java-format
 msgid "Opening {0} files..."
-msgstr ""
+msgstr "Avataan {0} tiedostoa..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1492,14 +1497,15 @@
 msgstr[1] "{0} objektiin"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Asetukset..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Muokkaa JOSM:n asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Asetukset"
@@ -1644,17 +1650,17 @@
 msgstr "Ohje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Raportti"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopioi leikepöydälle ja sulje"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1798,34 +1804,34 @@
 msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Valitse joko:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Yksi piste jolla on tageja, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Yksi piste, joka on useamman polun käytössä, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1834,5 +1840,5 @@
 "polkujen käytössä, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1841,5 +1847,5 @@
 "käytössä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1852,9 +1858,9 @@
 "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Irroitettu piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1862,5 +1868,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2027,4 +2033,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Takaisin"
@@ -2119,5 +2127,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144
 msgid "No data found in this area."
-msgstr ""
+msgstr "Tällä alueella ei ole dataa."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
@@ -2439,16 +2447,20 @@
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
+"<b>Sörnäisten rantatie</b> - 'Sörnäisten' ja 'rantatie' joko avaimessa tai "
+"arvossa"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
+"<b>\"Sörnäisten rantatie\"</b> - 'Sörnäisten rantatie' joko avaimessa tai "
+"arvossa"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr ""
+msgstr "<b>name:Sörn</b> - 'Sörn' missä kohtaa vain nimeä"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> - avaimen 'type' arvo täsmälleen 'route'."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
@@ -2457,8 +2469,10 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> - avaimen 'type' mitä vain. Kokeile myös <b>*=arvo</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr ""
+msgstr "<b>-name:Sörn</b> - 'Sörn' ei missään kohtaa nimeä."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
@@ -2474,16 +2488,18 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
+"<b>type:</b> - objektin tyyppi (<b>node</b> (piste), <b>way</b> (polku), "
+"<b>relation</b> (relaatio))"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr ""
+msgstr "<b>user:</b>... - käyttäjän muokkaamat objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
+msgstr "<b>user:anonymous</b> - anonyymin käyttäjän muokkaamat objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b>id:</b>... - objektin haku ID:llä (0 uusille objekteille)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
@@ -2492,4 +2508,6 @@
 "assigned version)"
 msgstr ""
+"<b>version:</b>... - objektin haku versionumerolla (0 objekteilla joilla ei "
+"ole versiota)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2498,4 +2516,6 @@
 "assigned changeset)"
 msgstr ""
+"<b>changeset:</b>... - objekti joka on annetussa muutoskokoelmassa (0 "
+"objekteilla jota eivät kuulu mihinkään)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
@@ -2504,4 +2524,6 @@
 "min-max)"
 msgstr ""
+"<b>nodes:</b>... - objekti jossa on annettu määrä pisteitä (nodes:määrä tai "
+"nodes:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
@@ -2510,4 +2532,6 @@
 "max)"
 msgstr ""
+"<b>nodes:</b>... - objekti jossa on annettu määrä tageja (nodes:määrä tai "
+"nodes:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
@@ -2519,17 +2543,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid "<b>modified</b> - all changed objects"
-msgstr ""
+msgstr "<b>modified</b> - kaikki muokatut objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid "<b>selected</b> - all selected objects"
-msgstr ""
+msgstr "<b>selected</b> - kaikki valitut objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "<b>incomplete</b> - all incomplete objects"
-msgstr ""
+msgstr "<b>incomplete</b> - kaikki keskeneräiset objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
+msgstr "<b>untagged</b> - kaikki tagittomat objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
@@ -2732,5 +2756,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
 msgid "Relation ..."
-msgstr ""
+msgstr "Relaatio..."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
@@ -3224,24 +3248,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Asetukset tallennettu kohteeseen {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Asetuksia ei voitu lähettää. Syy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Asetuksia ei voitu ladata palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3250,5 +3274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3259,5 +3283,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3672,6 +3696,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3837,5 +3861,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3850,10 +3874,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "tie"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3861,15 +3885,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vesiväylä"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "maankäyttö"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3882,6 +3906,11 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Julkinen liikenne"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3890,5 +3919,5 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3914,13 +3943,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
-msgstr ""
+msgstr "Sisäinen palvelinvirhe"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
-msgstr ""
+msgstr "Virheellinen pyyntö"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
-msgstr ""
+msgstr "Ei löytynyt"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
@@ -3930,11 +3959,21 @@
 msgstr "Ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Yhteys epäonnistui"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Yhteys epäonnistui"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Tuntematon palvelin"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
-msgstr ""
+msgstr "Objekti poistettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
@@ -4032,65 +4071,65 @@
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Aseta kieli."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+msgstr "/polku/josmin/hakemistoon/         "
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4099,9 +4138,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4109,25 +4148,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktivoidaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Ladataan liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4140,5 +4179,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4147,5 +4186,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4253,7 +4292,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
-msgstr ""
+msgstr "Käyttäjä:"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:371
@@ -4318,10 +4357,10 @@
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poistetaan {0} objekti"
+msgstr[1] "Poistetaan {0} objektia"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
 msgid "Delete objects"
-msgstr ""
+msgstr "Poista objektit"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
@@ -4401,5 +4440,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
+msgstr "Pisteet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
@@ -4417,5 +4456,5 @@
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr ""
+msgstr "Tagit ({0} konfliktia)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
@@ -4909,5 +4948,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4922,5 +4961,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4928,5 +4967,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5016,5 +5055,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "ei mitään"
@@ -5194,5 +5233,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5204,5 +5243,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5241,13 +5280,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:262
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Avaa aktiivisen tason muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:307
 msgid "Select all objects assigned to the currently selected changesets"
-msgstr ""
+msgstr "Valitse kaikki objektit jotka ovat valitussa muutoskokoelmassa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:366
@@ -5259,9 +5298,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:367
 msgid "Download information about the selected changesets from the OSM server"
-msgstr ""
+msgstr "Lataa valittujen muutoskokoelmien tiedot OSM-palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:402
 msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Sulkee valitut avoimet muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:433
@@ -5280,5 +5319,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:474
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
+msgstr "Avaa valitut muutoskokoelmat muutoskokoelmien hallintaikkunaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5298,5 +5337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5305,5 +5344,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5384,13 +5423,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Lisää"
@@ -5521,54 +5560,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Avaa lista kaikista relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaatiot: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Poista valittu relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -5674,9 +5713,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
 msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Näytä muutoskokoelman perustiedot"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
 msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Näytä muutoskokoelman tagit"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
@@ -5686,5 +5725,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
 msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr ""
+msgstr "Näytä muutoskokoelmassa luodut, muokatut ja poistetut objektit"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
@@ -5709,34 +5748,36 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
 msgid "Remove the selected changesets from the local cache"
-msgstr ""
+msgstr "Poista valitut muutoskokoelmat paikallisesta välimuistista"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
 msgid "Close the selected changesets"
-msgstr ""
+msgstr "Sulje valitut muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323
 msgid "Update changeset"
-msgstr ""
+msgstr "Päivitä muutoskokoelman tiedot"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
+msgstr "Päivittää valittujen muutoskokoelmien tiedot OSM-palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr ""
+msgstr "Lataa muutoskokoelman sisältö"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
 msgid "Download the content of the selected changesets from the server"
-msgstr ""
+msgstr "Lataa valittujen muutoskokoelmien sisältö palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
 msgid "My changesets"
-msgstr ""
+msgstr "Omat muutoskokoelmani"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
 msgstr ""
+"Lataa omat muutoskokoelmani OSM-palvelimelta (maksimissaan 100 "
+"muutoskokoelmaa)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
@@ -5750,15 +5791,15 @@
 msgctxt "changeset.upload-comment"
 msgid "empty"
-msgstr ""
+msgstr "tyhjä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
 msgctxt "changeset.open"
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
 msgctxt "changeset.open"
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
@@ -5766,26 +5807,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
 msgid "anonymous"
-msgstr ""
+msgstr "anonyymi"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
 msgid "Comment"
-msgstr ""
+msgstr "Kommentti"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr ""
+msgstr "Luotu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
 msgid "Closed at"
-msgstr ""
+msgstr "Suljettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
@@ -5795,5 +5836,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
 msgid "Downloading changeset content"
-msgstr ""
+msgstr "Ladataan muutoskokoelman sisältöä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
@@ -5806,10 +5847,10 @@
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Ladataan muutoskokoelman {2} sisältöä..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -5818,5 +5859,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
 msgid "Download content"
-msgstr ""
+msgstr "Ladataan sisältöä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
@@ -5825,24 +5866,24 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Lataa muutoskokoelman sisältö OSM-palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310
 msgid "Update content"
-msgstr ""
+msgstr "Päivitä sisältö"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
 msgid "Update the changeset content from the OSM server"
-msgstr ""
+msgstr "Päivitä muutoskokoelman sisältö OSM-palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
 msgid "Show history"
-msgstr ""
+msgstr "Näytä historia"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr ""
+msgstr "Lataa ja näytä valittujen objektien historia"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
@@ -5888,29 +5929,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
 msgid "The content of this changeset is not downloaded yet."
-msgstr ""
+msgstr "Muutoskokoelman sisältöä ei ole vielä ladattu."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download now"
-msgstr ""
+msgstr "Lataa nyt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
-msgstr ""
+msgstr "Lataa muutoskokoelman sisältö"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr ""
+msgstr "Luotu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
 msgid "Updated"
-msgstr ""
+msgstr "Muokattu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
 msgid "Deleted"
-msgstr ""
+msgstr "Poistettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6806,13 +6847,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
 msgid "Comment:"
-msgstr ""
+msgstr "Kommentti:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr ""
+msgstr "Avoin/Suljettu:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
@@ -6822,27 +6863,28 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
 msgid "Created on:"
-msgstr ""
+msgstr "Luotu:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
 msgid "Closed on:"
-msgstr ""
+msgstr "Suljettu:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
 msgctxt "changeset.state"
 msgid "Open"
-msgstr ""
+msgstr "Avoin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
 msgctxt "changeset.state"
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
 msgid "Remove the changeset in the detail view panel from the local cache"
 msgstr ""
+"Poista tarkasteltavan muutoskokoelman tiedot paikallisesta välimuistista"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
 msgid "Update the changeset from the OSM server"
-msgstr ""
+msgstr "Päivitä muutoskokoelma OSM-palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
@@ -6850,5 +6892,5 @@
 "Select the primitives in the content of this changeset in the current data "
 "layer"
-msgstr ""
+msgstr "Valitse muutoskokoelmaan kuuluvat objektit aktiivisella tasolla"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -6870,5 +6912,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr ""
+msgstr "Lataa muutoskokoelmat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
@@ -6879,17 +6921,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "open"
-msgstr ""
+msgstr "avoin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "closed"
-msgstr ""
+msgstr "suljettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
 msgid "Changeset ID: "
-msgstr ""
+msgstr "Muutoskokoelman ID: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changset id"
-msgstr ""
+msgstr "Anna muutoskokoelman ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -6905,58 +6947,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+msgstr "Valitse annetun käyttäjän muutoskokoelmat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+msgstr "Käyttäjänimi: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+msgstr "Vain omat muutoskokoelmani"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6964,58 +7006,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+msgstr "Virheellinen käyttäjänimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+msgstr "Päivämäärä: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7023,9 +7065,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7033,5 +7075,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7039,15 +7081,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7055,9 +7097,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7066,5 +7108,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7075,5 +7117,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Lataa vain omat muutoskokoelmani"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7091,9 +7133,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Perus"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7103,5 +7146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7112,14 +7155,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Hae muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Hae ja lataa muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
@@ -7138,5 +7181,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Haetaan ja ladataan muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
@@ -7146,5 +7189,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Hae ja lataa muutoskokoelmia..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
@@ -7152,22 +7195,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7176,10 +7221,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7188,10 +7233,10 @@
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7200,5 +7245,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7207,9 +7252,9 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Valitse arvo"
@@ -7237,61 +7282,57 @@
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Poista {0} relaatio"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Viivanpiirtoasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Viivanpiirtoasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Viivanpiirtoasetukset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7347,5 +7388,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7359,12 +7400,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -7977,6 +8018,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8254,5 +8296,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
-msgstr ""
+msgstr "Muutoskokoelma"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
@@ -8270,5 +8312,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Changeset info"
-msgstr "Muutoskokoelma"
+msgstr "Muutoskokoelman tiedot"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
@@ -8454,18 +8496,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "Lähetä uuteen muutoskokoelmaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
-"Avaa uusi muutoskokoelma ja käytä sitä seuraavan kerran lähetettäessä dataa"
+msgstr "Avaa uusi muutoskokoelma ja käytä sitä lähetettäessä dataa"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "Lähetä olemassa olevaan muutoskokoelmaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Lähetä tiedot olemassaolevaan ja avoimeen muutoskokoelmaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
@@ -8937,5 +8978,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr ""
+msgstr "Objektit lähetetään <strong>uuteen muutoskokoelmaan</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -8945,12 +8986,14 @@
 "comment ''{1}''."
 msgstr ""
+"Obejktit lähetetään <strong>avoimeen muutoskokoelmaan</strong> {0} jonka "
+"kommentti on ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
+msgstr "Muutoskokoelma <strong>suljetaan</strong> lähetyksen jälkeen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56
 msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr ""
+msgstr "Muutoskokoelma <strong>jätetään auki</strong> lähetyksen jälkeen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
@@ -8964,5 +9007,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"Lähetetään <strong>{0} objekti</strong> <strong>yhteen muutoskokoelmaan</"
+"strong>"
 msgstr[1] ""
+"Lähetetään <strong>{0} objektia</strong> <strong>yhteen muutoskokoelmaan</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -8975,5 +9022,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"Lähetetään <strong>{0} objekti</strong> <strong>yhteen muutoskokoelmaan</"
+"strong> käyttäen <strong>1 pyyntö</strong>"
 msgstr[1] ""
+"Lähetetään <strong>{0} objektia</strong> <strong>yhteen muutoskokoelmaan</"
+"strong> käyttäen <strong>1 pyyntö</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -8983,4 +9034,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
+"Lähetetään <strong>{0} objektia</strong> <strong>yhteen muutoskokoelmaan</"
+"strong> käyttäen <strong>{1} pyyntöä</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97
@@ -8998,4 +9051,6 @@
 "strong> using <strong>{1} requests</strong>"
 msgstr ""
+"Lähetetään <strong>{0} objektia</strong> <strong>moneen muutoskokoelmaan</"
+"strong> käyttäen <strong>{1} pyyntöä</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66
@@ -9039,6 +9094,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9055,5 +9110,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
 msgid "Changeset is full"
-msgstr ""
+msgstr "Muutoskokoelma on täynnä"
 
 #. we tried to delete an already deleted primitive.
@@ -9124,9 +9179,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9137,5 +9191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "Avaa ja käytä tarvittava määrä muutoskokoelmia"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
@@ -9148,4 +9202,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9579,24 +9640,24 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Virhe tulkittaessa {0}:aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei voitu lukea \"{0}\":aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9607,34 +9668,34 @@
 "kuva.<br>Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "GPS:n aika (lue ylläolevasta kuvasta): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [pp/kk/vvvv tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Ei päivämäärää"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Avaa toinen kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9644,114 +9705,116 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Ei ladattuja GPS-jälkiä>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX-jälki: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Avaa toinen GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9759,21 +9822,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -9781,17 +9844,17 @@
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9800,5 +9863,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9807,56 +9870,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Luetaan {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9864,22 +9927,22 @@
 msgstr[1] "kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10067,4 +10130,577 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Käytä globaaleja asetuksia."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Tekijät"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanava"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Käyttäjänimi: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Salasana"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Käännä oikealle"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Lisää ominaisuuksia"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Tekijät"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Syötä käyttäjänimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Syötä käyttäjänimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Pääsy (access)"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Lisäasetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Syötä käyttäjänimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Syötä käyttäjänimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Valitse ainakin yksi solmu tai tie"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Sulje ikkuna ja peruuta lataus"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Sulje ikkuna ja tee uusi solmu"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Lähetä asetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Pyynnös tiedot: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Ravintola"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Pääsy (access)"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Päivitys epäonnistui"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "merkkijono;merkkijono;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10096,5 +10732,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10102,5 +10738,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10108,7 +10744,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Ole hyvä ja valitse poistettava rivi."
@@ -10553,12 +11189,4 @@
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Säilytä varmuuskopiotiedostot"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Lisää tallennettaessa varmuuskopiotiedostojen loppuun ~-merkki"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10597,17 +11225,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Ulkoasu ja käyttötuntuma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Oletusarvo (automaattisesti päätetty)"
@@ -10674,10 +11297,20 @@
 msgstr "Muokkaa liitännäissivustoja"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Sulje ikkuna ja tee uusi solmu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Peruuta muutokset ja sulje tämä ikkuna"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Näyttöasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10685,29 +11318,29 @@
 msgstr "Asetukset, jotka vaikuttavat ohjelman visuaaliseen ilmeeseen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "OSM-palvelimen yhteysasetukset."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Kartta-asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Karttaprojektion ja datatulkinnan asetukset."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Ääniasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Äänentoiston ja äänitiedostomerkkien asetukset."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -10736,86 +11369,28 @@
 msgstr "Projektiota {0} ei voitu aktivoida. Käytetään Mercatoria"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Nähtävyys"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Välityspalvelinasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Karttatietokantapalvelun URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM-salasana"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11103,4 +11678,252 @@
 msgstr "Muuttujaryhmät"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Yhteys epäonnistui"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Käytä oletusarvoa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Lisää tallennettaessa varmuuskopiotiedostojen loppuun ~-merkki"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM-salasana"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman minkäänlaista "
+"salausta.<br>Salasana lähetetään salaamattomana palvelimelle URL-osoitteessa."
+"</br><b>Älä käytä arvokasta salasanaa.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Asetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Karttatietokantapalvelun URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Tarkista"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Nykyinen arvo on oletus."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11244,5 +12067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11294,23 +12117,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11319,16 +12148,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11336,5 +12165,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11342,5 +12171,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11576,5 +12405,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11618,5 +12447,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11664,30 +12493,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11846,4 +12675,19 @@
 msgstr "Muutoskokoelmalistaa käsitellään..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12092,11 +12936,11 @@
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ladataan {0} muutoskokoelma..."
+msgstr[1] "Ladataan {0} muutoskokoelmaa..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:144
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr ""
+msgstr "({0}/{1}) Ladataan muutoskokoelmaa {2} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:173
@@ -12108,5 +12952,5 @@
 #, java-format
 msgid "Downloading content for changeset {0} ..."
-msgstr ""
+msgstr "Ladataan muutoskokoelman {0} sisältöä..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -12139,23 +12983,28 @@
 msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Muutoskokoelmaa {0} luetaan..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12538,5 +13387,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12545,5 +13394,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12553,5 +13402,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12561,5 +13410,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12568,5 +13442,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12575,5 +13449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12582,9 +13456,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12593,5 +13467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12601,5 +13475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12608,5 +13482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12615,5 +13489,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12622,10 +13496,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12634,10 +13508,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12648,5 +13522,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12656,5 +13530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12665,18 +13539,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12703,4 +13564,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13087,5 +13954,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13136,5 +14003,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13143,25 +14016,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13170,13 +14041,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13184,34 +14055,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13223,18 +14094,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Ranskan kiinteistörekisteri-WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13242,5 +14113,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13248,44 +14119,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13396,5 +14267,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13402,14 +14273,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13417,14 +14288,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13432,21 +14303,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13555,28 +14426,28 @@
 msgstr "Tyhjä taso"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13585,47 +14456,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Käytä"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Väriteema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13787,6 +14658,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Päivitä"
@@ -14013,33 +14884,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "itä"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "koillinen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "pohjoinen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "luode"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "länsi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "lounas"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "etelä"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "kaakko"
@@ -14079,5 +14950,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14088,76 +14959,76 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "vesi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "rantaviiva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "maa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Enimmäismäärä segmenttejä/polku"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Harmaan enimmäisarvo, joka tulkitaan vetenä (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Landsat-kuvien koko (pikselit/aste)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Landsat-kuvien koko (pikseleinä)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Siirrä kaikkia jälkiä itään (astetta)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Siirrä kaikkia jälkiä pohjoiseen (astetta)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Suunta, josta etsitään maata"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Anna poluille tagi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS-taso"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Välimuistin maksimikoko (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Välimuistin enimmäisikä (päivää)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -14165,5 +15036,5 @@
 "250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14173,5 +15044,5 @@
 "yksinkertaistusta). Oletusarvo 50000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14181,5 +15052,5 @@
 "väliltä 0-255, oletus 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14189,26 +15060,26 @@
 "antavat enemmän pisteitä ja tarkempia jälkiä. Oletus on 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Landsat-kuvien tarkkuus, pikselit/aste. Oletus on 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Landsat-kuvan koko pikseleinä. Oletus on 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Mistä suunnasta etsitään maata. Oletus on itä."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14216,25 +15087,25 @@
 "(nothing). Oletus on vesi (water)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Käytettävä WMS-taso. Oletus on IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Jokaisen välimuistihakemiston enimmäiskoko. Oletus on 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Välimuistin enimmäisikä päivissä. Oletus on 100."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Tietolähteen nimi. Oletus on Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Liitännäinen vesimassojen rajaamiseen Landsat-kuvista."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakevalker-liitännäisen asetukset"
@@ -14444,5 +15315,5 @@
 msgstr "OpenStreetBugs-latauslooppi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Näyttä OpenStreetBugs-ongelmat"
@@ -14469,5 +15340,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14482,14 +15352,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Avaa OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14499,22 +15377,31 @@
 "OpenStreetBugs:sta"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Lisää kommentti"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Syötä kommenttisi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Kommentti:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Merkitse valmiiksi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Suljetaanko?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14522,23 +15409,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Sulje"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Uusi ongelma"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Luo ongelma"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Kuvaile ongelma tarkasti"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Luotu"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Syötä käyttäjänimi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Tuntematon ongelman tila"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Avaa OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14560,10 +15475,10 @@
 msgstr "Tuntematon tiedostopääte: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14573,5 +15488,5 @@
 "asetusten karttasivulta."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14581,37 +15496,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "lataa data API:sta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "vaihda valinta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "vaihda näkymä"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "varmista kaikki etähallinnan toimenpiteet käsin"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Etähallinta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Asetukset etähallintaliitännäiselle."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14622,5 +15537,5 @@
 "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Sallitut toiminnot"
@@ -14734,25 +15649,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14798,42 +15713,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -15065,37 +15980,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Käytä ohituslistaa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Jätä varoituksia näyttämättä ohituslistan mukaisesti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Käytä virhetasoa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Käytä virhetasoa ongelmallisten elementtien näyttämiseen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Näytä myös huomautukset ennen tietojen lähetystä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Tarvittaessa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Lähetettäessä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15105,5 +16020,5 @@
 "virheitä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Datantarkistin"
@@ -15719,5 +16634,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "rakennus"
@@ -15731,5 +16646,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "alue"
@@ -16127,55 +17042,55 @@
 msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "WMS-liitännäisen asetukset"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17711,6 +18626,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "moottoritie"
@@ -17736,6 +18651,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "valtatie"
@@ -17761,6 +18676,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "kantatie"
@@ -17786,6 +18701,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "seututie"
@@ -17799,5 +18714,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "yhdystie"
@@ -17815,5 +18730,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "asuinkatu"
@@ -17847,6 +18762,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17880,6 +18795,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17929,5 +18844,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -18913,5 +19828,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "suo"
@@ -20310,7 +21225,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr ""
@@ -21038,28 +21953,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "urheilu"
@@ -22754,4 +23669,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22786,9 +23709,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24196,7 +25119,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "polkupyörä"
@@ -24266,7 +25189,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24292,5 +25215,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro"
@@ -24586,5 +25509,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24626,5 +25549,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24734,4 +25657,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24769,5 +25698,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24840,11 +25769,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24907,5 +25836,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24961,7 +25890,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -25032,9 +25961,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -25126,5 +26055,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25138,5 +26067,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25157,10 +26086,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "kääntöympyrä"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25170,5 +26099,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25183,5 +26112,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr ""
@@ -25195,5 +26124,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr ""
@@ -25207,5 +26136,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25394,13 +26323,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25462,7 +26391,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25485,10 +26414,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25524,7 +26453,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25570,6 +26499,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25583,5 +26512,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminaali"
@@ -25603,5 +26532,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25615,5 +26544,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25675,7 +26604,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "köysirata"
@@ -25692,5 +26621,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25705,5 +26634,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25718,5 +26647,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25731,5 +26660,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25744,5 +26673,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25757,5 +26686,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25875,11 +26804,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25893,5 +26822,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "laituri"
@@ -25905,5 +26834,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr ""
@@ -26047,13 +26976,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr ""
@@ -26067,5 +26996,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26161,10 +27090,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26266,14 +27195,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26669,5 +27605,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26692,23 +27628,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26740,6 +27676,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26800,8 +27736,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr ""
@@ -27154,26 +28090,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "kauppa"
@@ -27245,8 +28181,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotelli"
@@ -27317,5 +28253,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27324,5 +28260,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27332,5 +28268,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27339,5 +28275,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27347,9 +28283,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turismi"
@@ -27437,14 +28373,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historiallinen"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27453,5 +28388,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "louhos"
@@ -27465,5 +28400,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -27485,5 +28420,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "valuma-alue"
@@ -27497,5 +28432,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "talousmetsä"
@@ -27509,5 +28444,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27530,7 +28465,7 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
-msgstr ""
+msgstr "kaupallinen"
 
 #. color retail
@@ -27542,7 +28477,7 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
-msgstr ""
+msgstr "teollisuus"
 
 #. color industrial
@@ -27554,5 +28489,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27566,5 +28501,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27578,7 +28513,7 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
-msgstr ""
+msgstr "rata-alue"
 
 #. color construction
@@ -27633,9 +28568,9 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
-msgstr ""
+msgstr "armeija"
 
 #. color military
@@ -27647,5 +28582,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -27658,5 +28593,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "huippu"
@@ -27671,5 +28606,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "jäätikkö"
@@ -27683,5 +28618,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "tulivuori"
@@ -27736,8 +28671,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27751,5 +28686,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "pusikko"
@@ -27763,5 +28698,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "nummi"
@@ -27775,5 +28710,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27787,5 +28722,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "muta"
@@ -27799,5 +28734,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "ranta"
@@ -27875,8 +28810,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "reitti"
@@ -27899,4 +28834,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27924,7 +28900,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "raja"
@@ -28074,11 +29055,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -28126,6 +29107,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "osoite"
@@ -28481,4 +29462,9 @@
 msgstr "Sicily - Italy"
 
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
+
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
@@ -28583,7 +29569,4 @@
 #~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
 #~ msgid "Enable proxy server"
 #~ msgstr "Käytä välityspalvelinta"
@@ -28642,7 +29625,4 @@
 #~ msgid "zoom"
 #~ msgstr "zoom"
-
-#~ msgid "Validate"
-#~ msgstr "Tarkista"
 
 #~ msgid "All images"
@@ -28923,14 +29903,4 @@
 #~ msgstr "Tahdista aika GPS-yksikön kanssa"
 
-#~ 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>VAROITUS: Salasana on tallennettu asetustiedostoon ilman "
-#~ "minkäänlaista salausta.<br>Salasana lähetetään salaamattomana "
-#~ "palvelimelle URL-osoitteessa.</br><b>Älä käytä arvokasta salasanaa.</b></"
-#~ "html>"
-
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Ei voitu lukea URL:stä: \"{0}\""
@@ -29027,7 +29997,4 @@
 #~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
 #~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
-
-#~ msgid "Update failed"
-#~ msgstr "Päivitys epäonnistui"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 19246)
+++ applications/editors/josm/i18n/po/fr.po	(revision 19319)
@@ -3,4 +3,5 @@
 # Frederic Bonifas <fredericbonifas@gmail.com>, 2006.
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -9,7 +10,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-30 08:32+0000\n"
-"Last-Translator: François Blondel <Unknown>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-04 14:05+0000\n"
+"Last-Translator: Arnaud Mouronval <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +18,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Création de l’interface graphique de l'utilisateur"
@@ -41,5 +42,5 @@
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "IURL malformée ignorée: \"{0}\""
+msgstr "URL malformée ignorée : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:426
@@ -87,9 +88,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -100,5 +101,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "URL de fichier malformé ignoré: \"{0}\""
+msgstr "URL de fichier malformée ignorée : \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:458
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -302,4 +302,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Continuer"
@@ -330,5 +331,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -344,7 +345,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -479,6 +483,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -557,5 +562,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -569,5 +574,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Information"
@@ -768,15 +773,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Supprimer"
@@ -856,6 +861,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1520,14 +1525,15 @@
 msgstr[1] "vers les primitives {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Préférences..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Ouvrir la page des préférences pour les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Préférences"
@@ -1674,17 +1680,17 @@
 msgstr "Aide : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Rapport d'état"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Copier vers le presse-papier et fermer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1832,33 +1838,33 @@
 msgstr "Ce nœud n’est pas collé à quelque chose d’autre."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Aucun de ces nœuds ne sont collés à autre chose."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Aucun des nœuds de cette voie ne sont collés à autre chose."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Rien ne peut être séparé dans la sélection actuelle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Sélectionner au choix :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nœud taggué, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nœud utilisé par plus d’une voie, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nœud utilisé par plus d’une voie et une de ces voies, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1866,5 +1872,5 @@
 "* Une voie qui a un ou plusieurs nœuds utilisés par plus d’une voie, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1872,5 +1878,5 @@
 "* Une voie et un ou plusieurs de ses nœuds utilisés par plus d’une voie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1884,9 +1890,9 @@
 "sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nœud séparé"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1894,5 +1900,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2065,4 +2071,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Retour"
@@ -3034,15 +3042,15 @@
 #, java-format
 msgid "Set the 'modified' flag for node {0}"
-msgstr ""
+msgstr "Flag 'modified' positionné pour le noeud {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
 #, java-format
 msgid "Set the 'modified' flag for way {0}"
-msgstr ""
+msgstr "Flag 'modified' positionné pour le chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
 #, java-format
 msgid "Set the 'modified' flag for relation {0}"
-msgstr ""
+msgstr "Flag 'modified' positionné pour la relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
@@ -3327,24 +3335,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Préférences sauvegardées sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Impossible de charger les préférences. Raison : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Impossible de charger les préférences depuis le serveur."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3353,5 +3361,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3362,5 +3370,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3779,6 +3787,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3941,8 +3949,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
+msgstr "Ne plus afficher (choix mémorisé)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3957,10 +3965,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "highway"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3968,15 +3976,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "voie navigable"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "utilisation du terrain"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3989,6 +3997,11 @@
 msgstr[1] "{0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Transport public"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3997,5 +4010,5 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4037,9 +4050,19 @@
 msgstr "Conflit"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Échec de la connexion"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Échec de la connexion"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Hôte inconnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Objet effacé"
@@ -4147,65 +4170,65 @@
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Télécharge la zone sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharge l’emplacement donné par l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Ouvrir fichier (données brutes gps, si .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone sélectionnée en données GPS brut."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Définir la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Changer le répertoire pour tous les paramètres utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4217,9 +4240,9 @@
 "      pour augmenter la taille maximale de mémoire allouée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4230,25 +4253,25 @@
 "sur d’avoir chargé des données avant --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Activation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4261,5 +4284,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4268,5 +4291,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4374,5 +4397,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Utilisateur :"
@@ -4390,5 +4413,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
 msgid "Click to cancel the current operation"
-msgstr ""
+msgstr "Cliquer pour annuler l'opération courrante"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4455,5 +4478,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
 msgid "To delete"
-msgstr ""
+msgstr "À effacer"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
@@ -5076,5 +5099,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5089,5 +5112,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5095,5 +5118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5183,5 +5206,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "rien"
@@ -5361,5 +5384,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5371,5 +5394,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5464,5 +5487,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5471,5 +5494,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5554,13 +5577,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Ajouter"
@@ -5691,33 +5714,33 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Ouvrir une liste de toutes les relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Supprimer la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5726,21 +5749,21 @@
 "d'édition"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -7078,58 +7101,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7137,58 +7160,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7196,9 +7219,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7206,5 +7229,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7212,15 +7235,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7228,9 +7251,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7239,5 +7262,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7264,9 +7287,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Basique"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7276,5 +7300,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7285,5 +7309,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7325,22 +7349,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7349,10 +7375,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7361,10 +7387,10 @@
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7373,5 +7399,5 @@
 msgstr[1] "Modifier les propriétés de {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7380,9 +7406,9 @@
 msgstr[1] "Cela modifiera {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Veuillez sélectionner une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Veuillez sélectionner une valeur"
@@ -7411,61 +7437,57 @@
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer vraiment la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Supprimer {0} relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Aucune relation sélectionnée"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Sélectionner les options de dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Sélectionner les options de dessin des lignes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7523,5 +7545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7536,12 +7558,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Chargement des parents de la relation {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8172,6 +8194,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9267,6 +9290,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9354,9 +9377,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9378,4 +9400,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9818,24 +9847,24 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Fichiers GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erreur pendant le traitement {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossible de lire \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9847,34 +9876,34 @@
 "hpoto et sélectionnez un fuseau horaire.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Heure de la photo (information EXIF) :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Heure du GPS (lu sur la photo) : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [jj/mm/aaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Je suis dans le fuseau horaire de : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Aucune date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Ouvrez une autre photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchroniser l’heure avec une photo du GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9884,114 +9913,116 @@
 "Merci d’utiliser le format demandé"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Date non valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Aucune trace GPX encore chargée>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "Trace GPX : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Ouvrir une autre trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Estimation automatique"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Fuseau horaire : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Décallage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Correler les images avec la trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Corréler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Fuseau horaire invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Décallage invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuseau horaire : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10002,22 +10033,22 @@
 "manuellement."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "La correspondance des photos avec la trace a échoué"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 "Les photos sélectionnées ne contiennent pas d'information d'horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Les photos ne contienne tpas d'information d'horodatage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10026,17 +10057,17 @@
 "autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "La trace GPX n'a pas d'horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Vous devez sélectionner une trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Aucune trace GPX sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10047,5 +10078,5 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10056,56 +10087,56 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extractions des positions GPS depuis les informations EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Début du parcours du dossier"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Un des fichiers sélectionnés était vide."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Lexture des images…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lecture de {0}…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Parcours du dossier {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fichier vide trouvé dans le dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10113,22 +10144,22 @@
 msgstr[1] "images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} ont été trouvées pour être géoétiquettées."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10325,4 +10356,590 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Utiliser les réglages généraux."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Auteurs"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Cliquer pour annuler la fusion des noeuds"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Canal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nom d’utilisateur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Mot de passe"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Rotation à droite"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Ajouter des Propriétés"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Auteurs"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Merci d'entrer votre nom d'utilisateur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Merci d'entrer votre nom d'utilisateur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Échec d’initialisation de l’API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Accès"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Configuration avancée"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Entrer l'expression à rechercher."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Merci d'entrer votre nom d'utilisateur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Merci d'entrer votre nom d'utilisateur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Cliquer pour annuler l'opération courrante"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Veuillez sélectionner au moins un nœud ou une voie."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Aucun résultat trouvé pour \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Fermer cette fenêtre et annuler le téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Fermer la boîte de dialogue et créer un nouveau nœud"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Attention : impossible de forcer les préférences pour ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Sauvegarde du calque vers ''{0}''…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Charger les préférences"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Référence du pylône"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Demander une mise à jour"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Cliquer <strong>{0}</strong> pour commencer la fusion de leurs "
+"éléments avec les miens</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Cliquez pour supprimer la destination"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Point d’accès d’urgence"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Cliquez pour supprimer la destination"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Accès"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "La mise à jour a échoué"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne du serveur."
+"<br>Il s'agit probablement d'un problème temporaire. Veuillez réessayer plus "
+"tard.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "texte;texte;…"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10357,5 +10974,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10363,5 +10980,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10369,7 +10986,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Veuillez sélectionnez la rangée à supprimer."
@@ -10849,14 +11466,4 @@
 msgstr "Données OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Garder les fichiers de sauvegarde (backup)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Lors de la sauvegarde, garder les fichiers de sauvegarde (backup) se "
-"terminant par ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10897,17 +11504,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Apparence et ressenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Par défaut (déterminé automatiquement)"
@@ -10974,10 +11576,20 @@
 msgstr "Configurer les sites de greffon."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Fermer la boîte de dialogue et créer un nouveau nœud"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Annuler les changements et fermer"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Réglages de l’affichage"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10985,30 +11597,30 @@
 msgstr "Divers réglages de l’apparence de tout le programme."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Réglages de connexion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Paramètres de connexion du serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Réglages de la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 "Réglages pour la projection de la carte et l’interprétation des données."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Paramètres Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Réglages pour le lecteur et les marqueurs audios."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Vous devez redémarrer JOSM pour que certains réglages prennent effet."
@@ -11035,92 +11647,29 @@
 msgstr "La projection {0} ne peut être activée. Utilisation de Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Attraction"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Paramètres du serveur mandataire (proxy)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "URL de base du serveur OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Nom d'utilisateur (e-mail) du compte OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Mot de passe d’identification au compte OSM. Laisser blanc pour ne stocker "
-"aucun mot de passe."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL du serveur de base"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "Nom d'utilisateur OSM (e-mail))"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Mot de passe OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>ATTENTION : Le mot de passe est stocké en texte clair dans le fichier "
-"de préférences.<br>Le mot de passe est transféré en texte clair au serveur, "
-"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11419,4 +11968,258 @@
 msgstr "Touches de raccourcis"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "URL invalide ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
+"votre connexion internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "La connexion a échoué."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Valeur par défaut"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Lors de la sauvegarde, garder les fichiers de sauvegarde (backup) se "
+"terminant par ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Nom d’utilisateur OSM (courriel)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Mot de passe OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>ATTENTION : Le mot de passe est stocké en texte clair dans le fichier "
+"de préférences.<br>Le mot de passe est transféré en texte clair au serveur, "
+"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Préférences"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL du serveur de base"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Valider"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "La valeur actuelle est par défaut."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Veuillez redémarrer JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11560,5 +12363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11610,23 +12413,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11635,16 +12444,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11652,5 +12461,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11658,5 +12467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11899,5 +12708,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11944,5 +12753,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11990,31 +12799,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-"L'ensemble de changements actuel est vide. Impossible d'envoyer les données."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12181,4 +12989,19 @@
 msgstr "Analyse de la liste des ensembles de changements…"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12478,23 +13301,28 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "Le tag XML <user> est manquant."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Lecture de {0}…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12880,5 +13708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12887,5 +13715,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12895,5 +13723,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12906,5 +13734,30 @@
 "d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12913,5 +13766,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12920,5 +13773,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12927,9 +13780,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Le serveur à détecté un conflit.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12940,5 +13793,5 @@
 "<br> car il a déjà été fermé sur {1}. </html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12948,5 +13801,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12957,5 +13810,5 @@
 "votre connexion internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12964,5 +13817,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12974,10 +13827,10 @@
 "tard.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12986,10 +13839,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -13000,5 +13853,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13008,5 +13861,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13017,18 +13870,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13057,4 +13897,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13455,5 +14301,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Sélectionner la feuille cadastrale."
@@ -13504,5 +14350,11 @@
 msgstr "CadastreGrabber : url illégale."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13513,25 +14365,23 @@
 "ou action annulée"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Choisir parmi…"
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Sélectionner la commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Choisir parmi…"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13545,13 +14395,13 @@
 "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Restaurer la fontion de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM est arreté pour que la modification prenne effet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13561,34 +14411,34 @@
 "plan. L'exception était : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Remplacer le fond original par la couleur de fond de JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Inverser les couleurs grises (pour les fonds noir)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Rendre le fond transparent."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Tracer les limites des données téléchargées."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Activer le tampon automatique."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Taille max. du tampon (en MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13605,9 +14455,9 @@
 "<BR>avant tout chargement de données créé à partir de ce greffon."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS du cadastre français"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13615,10 +14465,10 @@
 "celle-ci est activé</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13628,5 +14478,5 @@
 "préférences de JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13636,9 +14486,9 @@
 "intermédiaires). Utile pour lire les textes sur fond noir."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Permet l'empilement de plusieurs calques"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13646,5 +14496,5 @@
 "gauche."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
@@ -13652,10 +14502,10 @@
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
@@ -13663,22 +14513,22 @@
 "mémoire)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Carré de taille fixe (par défaut  : 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Taille fixe (de 25 à 1000 mètres)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13800,5 +14650,5 @@
 "Voulez-vous les utiliser ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13806,14 +14656,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13821,14 +14671,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13836,21 +14686,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "Entrez la position est,nord du cadastre."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Est"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Nord"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13966,28 +14816,28 @@
 msgstr "Calque vide"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "N'est pas vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Est vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Zone de délimitation de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13998,9 +14848,9 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Erreur de format du tampon"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -14009,38 +14859,38 @@
 "courante"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Erreur de tampon de zone Lambert"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Utiliser"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Veuillez sélectionner un schéma à utiliser."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Schéma des couleurs"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Veuillez sélectionner un schéma à supprimer."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Utiliser le schéma sélectionné dans la liste."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Utiliser la couleur actuelle comme un nouveau schéma de couleur."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Supprimer le schéma sélectionné de la liste"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Schéma de couleurs"
@@ -14206,6 +15056,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Actualiser"
@@ -14437,33 +15287,33 @@
 msgstr "Une erreur inconnue est survenue"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "Est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "Nord-Est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "Nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "Nord-Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "Sud-Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "Sud"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "Sud-Est"
@@ -14503,5 +15353,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14512,76 +15362,76 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "eau"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "ligne côtière"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "terre"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Nombre maximum de segments par chemin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Nombre maximum de nœuds dans la trace initiale"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valeur de gris maximum à considérer comme de l’eau (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Précision de la simplification des lignes (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Résolution des dalles Landsat (pixels par degré)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Taille des dalles Landsat (en pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Décallage de toutes les traces vers l’est (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Décallage de toutes les traces vers len nord (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Direction vers laquelle chercher de la terre"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Etiquetter les chemins comme"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Calque WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Taille de cache maximum (Mo)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Age maximum du cache (en jours)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Texte source"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -14589,5 +15439,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14597,5 +15447,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14606,5 +15456,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14615,5 +15465,5 @@
 "lignes plus précises (0.0003 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14621,21 +15471,21 @@
 "Résolution des dalles Landsat, mesurée en pixels par degré (4000 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Taille d’une dalle Landsat, mesurée en pixels (2000 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Décallage de tous les points vers l’est en degrés (0 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Décallage de tous les points vers le nord en degrés (0 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Direction vers laquelle chercher de la terre (est par défaut)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14643,27 +15493,27 @@
 "rien du tout (eau par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Quel calque WMS faut il utiliser pour tracer contre. par défaut c'est IR-1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Taille maximum de chaque dossier de cache en octet. Par défaut : 300 Mo"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Age maximum de chaque fichier en cache. Par défaut : 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Texte de donnée source. Landsat par défaut."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Un greffon pour tracer les nappes d'eau des images Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Préférences du greffon LakeWalker"
@@ -14877,5 +15727,5 @@
 msgstr "Boucle de téléchargement OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Afficher les problèmes d'OpenStreetBugs"
@@ -14906,5 +15756,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14920,15 +15769,23 @@
 "L'en-tête contient plusieurs valeurs et ne peut être mappés en un seul Mot"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Ouvrir OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 "Ouvre la fenêtre OpenStreetBugs et active le téléchargement automatique"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14938,22 +15795,31 @@
 "donénes depuis OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Ajouter un commentaire"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Entrez votre commentaire"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Espace commun"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Marquer comme fait"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Fermé?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14963,23 +15829,51 @@
 "souhaitez peut-être ajouter un commentaire optionnel :</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Fermer"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nouveau problème"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Créer un problème"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Décrire le problème précisément"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Créé le :"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Merci d'entrer votre nom d'utilisateur"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Etat du problème inconnu"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Ouvrir OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15001,10 +15895,10 @@
 msgstr "Extension de fichier inconnue : {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -15014,5 +15908,5 @@
 "carte des Préférences."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Exécutable Firefox"
@@ -15022,38 +15916,38 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "chargement des données depuis l’API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "créer de nouveaux objets"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "Changer la sélection"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "changer le viewport"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "Confirmez toutes les actions Remote Control manuellement"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un greffon permettant à JOSM d’être contrôlé par d’autres applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Réglages du greffon Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15065,5 +15959,5 @@
 "dialogant avec le greffon."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Actions permises"
@@ -15179,25 +16073,25 @@
 msgstr "Suprimer l'itinéraire"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Préférences du greffon de navigation"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Configurer les préférences de navigation"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Type de route"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Vitesse (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Poids"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Entrez les valeurs du poids"
@@ -15243,42 +16137,42 @@
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "chargement automatique des tuiles"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Paramètres du greffon SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Sources des dalles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Zoom automatique : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Chargement automatique des tuiles : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Niveau de zoom maxi. : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Pâlissement  graduel de l'arrière plan : "
@@ -15515,39 +16409,39 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Utiliser la liste des éléments ignorés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 "Utiliser la liste des éléments ignorée pour supprimer les avertissements."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Utiliser le calque d’erreur."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Utiliser le calque d’erreur pour montrer les éléments problématiques."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Afficher le niveau d'information à l'envoi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 "Affiche les tests informatifs dans les fenêtres de vérification avant envoi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Sur demande"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "À l’envoi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15557,5 +16451,5 @@
 "les utilisateurs et les programmes d’édition."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Validateur des données"
@@ -16179,5 +17073,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "bâtiment"
@@ -16191,5 +17085,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "zone"
@@ -16388,5 +17282,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
 msgid "Not in cache"
-msgstr ""
+msgstr "Pas en cache"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -16603,56 +17497,56 @@
 msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Préférences du greffon WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Modifier la liste des serveurs WMS affichée dans le menu du greffon WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Nom du menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Nom du menu (Défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "URL de WMS (Défaut)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Entrer un nom pour le menu et un URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Veuillez sélectionner au moins une ligne à copier."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Outil de téléchargement :"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Tuiles se chevauchant"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -18236,6 +19130,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
@@ -18261,6 +19155,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "voie rapide"
@@ -18286,6 +19180,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
@@ -18311,6 +19205,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "secondary"
@@ -18324,5 +19218,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
@@ -18340,5 +19234,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "residential"
@@ -18372,6 +19266,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "service"
@@ -18405,6 +19299,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "construction"
@@ -18454,5 +19348,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "roundabout"
@@ -19438,5 +20332,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "marais"
@@ -20835,7 +21729,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "rue"
@@ -21563,28 +22457,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -23279,4 +24173,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23311,9 +24213,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "espace vert"
@@ -23419,5 +24321,5 @@
 #: build/trans_presets.java:2499
 msgid "Car Dealer"
-msgstr ""
+msgstr "Concessionnaire automobile"
 
 #. item "Shops/Car Dealer"
@@ -23430,5 +24332,5 @@
 #: build/trans_presets.java:2506
 msgid "Bike Dealer"
-msgstr ""
+msgstr "Boutique de Cycles"
 
 #. item "Shops/Bike Dealer"
@@ -24721,7 +25623,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "vélo/bicyclette"
@@ -24791,7 +25693,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "piéton"
@@ -24817,5 +25719,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "métro"
@@ -25111,5 +26013,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "déprécié"
@@ -25151,5 +26053,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "cheval"
@@ -25259,4 +26161,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25294,5 +26202,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25365,11 +26273,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "barrière"
@@ -25432,5 +26340,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "voie pour véhicules à moteur"
@@ -25486,7 +26394,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "piste"
@@ -25557,9 +26465,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "voie ferrée"
@@ -25651,5 +26559,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "services"
@@ -25663,5 +26571,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "gué"
@@ -25682,10 +26590,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "zone de manœuvre"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25695,5 +26603,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "accès d'urgence"
@@ -25708,5 +26616,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "berge"
@@ -25720,5 +26628,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "ruisseau"
@@ -25732,5 +26640,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "dock"
@@ -25919,13 +26827,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "artificiel"
@@ -25987,7 +26895,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "point ferroviaire"
@@ -26010,10 +26918,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "Autre voie ferrée"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "passage au dessus d'une voie ferrée"
@@ -26049,7 +26957,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "ligne ferroviaire touristique"
@@ -26095,6 +27003,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "piste d'atterrissage"
@@ -26108,5 +27016,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -26128,5 +27036,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "piste (sombre)"
@@ -26140,5 +27048,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "piste (claire)"
@@ -26200,7 +27108,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "couloir aérien"
@@ -26217,5 +27125,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "piste bleue"
@@ -26230,5 +27138,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "piste rouge"
@@ -26243,5 +27151,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "piste noire"
@@ -26256,5 +27164,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "piste_orange"
@@ -26269,5 +27177,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "hors piste"
@@ -26282,5 +27190,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "piste verte"
@@ -26400,11 +27308,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "alimentation électrique"
@@ -26418,5 +27326,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "appontement/jetée"
@@ -26430,5 +27338,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "canalisation"
@@ -26572,13 +27480,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "loisir"
@@ -26592,5 +27500,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "port"
@@ -26686,10 +27594,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "aménité"
@@ -26791,14 +27699,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "équipement de traffic"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27194,5 +28109,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27217,23 +28132,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "équipement lumineux"
@@ -27265,6 +28180,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "eau (claire)"
@@ -27325,8 +28240,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "santé"
@@ -27679,26 +28594,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "magasin"
@@ -27770,8 +28685,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hôtel"
@@ -27842,5 +28757,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27849,5 +28764,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27857,5 +28772,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27864,5 +28779,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27872,9 +28787,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "tourisme"
@@ -27962,14 +28877,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "patrimoine"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27978,5 +28892,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "carrière"
@@ -27990,5 +28904,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "décharge"
@@ -28010,5 +28924,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "bassin"
@@ -28022,5 +28936,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "forêt"
@@ -28034,5 +28948,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "bâtiments de ferme"
@@ -28055,5 +28969,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "commerce de proximité"
@@ -28067,5 +28981,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "zone industrielle"
@@ -28079,5 +28993,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "terrain en friche"
@@ -28091,5 +29005,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "espace vert"
@@ -28103,5 +29017,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -28158,7 +29072,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "zone militaire"
@@ -28172,5 +29086,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "cimetière"
@@ -28183,5 +29097,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "sommet"
@@ -28196,5 +29110,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "glacier"
@@ -28208,5 +29122,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "volcan"
@@ -28261,8 +29175,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "nature"
@@ -28276,5 +29190,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "broussailles"
@@ -28288,5 +29202,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "lande/bruyère"
@@ -28300,5 +29214,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "Zone de forêt"
@@ -28312,5 +29226,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "terrain boueux/vase"
@@ -28324,5 +29238,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "plage"
@@ -28400,8 +29314,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "route"
@@ -28424,4 +29338,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28449,7 +29404,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "frontière"
@@ -28599,11 +29559,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "lieu"
@@ -28651,6 +29611,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adresse"
@@ -29006,4 +29966,19 @@
 msgstr "Sicile - Italie"
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "URL de base du serveur OSM (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Nom d'utilisateur (e-mail) du compte OSM."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Mot de passe d’identification au compte OSM. Laisser blanc pour ne "
+#~ "stocker aucun mot de passe."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "Nom d'utilisateur OSM (e-mail))"
+
 #~ msgid "Move"
 #~ msgstr "Déplacer"
@@ -29106,7 +30081,4 @@
 #~ msgid "help"
 #~ msgstr "aide"
-
-#~ msgid "Validate"
-#~ msgstr "Valider"
 
 #~ msgid ""
@@ -29325,7 +30297,4 @@
 #~ msgid "error loading metadata"
 #~ msgstr "Erreur lors du chargement des metadata"
-
-#~ msgid "Request Update"
-#~ msgstr "Demander une mise à jour"
 
 #~ msgid "Copy Default"
@@ -29727,7 +30696,4 @@
 #~ msgstr "Nom d’utilisateur (e-mail) du compte OSM."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "Nom d’utilisateur OSM (courriel)"
-
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki."
@@ -29991,7 +30957,4 @@
 #~ msgid "Undeleting Way..."
 #~ msgstr "Restauration du chemin..."
-
-#~ msgid "Update failed"
-#~ msgstr "La mise à jour a échoué"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -30149,7 +31112,4 @@
 #~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
 
-#~ msgid "API initialization failed"
-#~ msgstr "Échec d’initialisation de l’API"
-
 #~ msgid "removing reference from way {0}"
 #~ msgstr "suppression de la référence du chemin {0}"
@@ -30381,2 +31341,7 @@
 #~ msgid "Uploading..."
 #~ msgstr "Envoi en cours…"
+
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr ""
+#~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les "
+#~ "données."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 19246)
+++ applications/editors/josm/i18n/po/gl.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-09-22 15:04+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 14:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -293,4 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr ""
@@ -321,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -335,7 +336,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -467,6 +471,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -545,5 +550,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -557,5 +562,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Información"
@@ -754,15 +759,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Borrar"
@@ -841,6 +846,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1483,14 +1488,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Abrir unha páxina de preferencias para a configuración global."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Preferencias"
@@ -1637,17 +1643,17 @@
 msgstr "Axda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Informe de Estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Copiar a porta papeis e pechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1786,34 +1792,34 @@
 msgstr "Este nodo non está pegado a outra cousa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ningún destes nodos estan pegados a outra cousa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ningún dos nodos desta vía están pegados a outra cousa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "A selección actual non pode ser usada para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Seleccionar ou ben:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo que está sendo usado por máis dunha vía, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1822,5 +1828,5 @@
 "vía, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1829,5 +1835,5 @@
 "vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1840,9 +1846,9 @@
 "obterán as súas propias copias e todos os nodos serán seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Despegar Nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1850,5 +1856,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2013,4 +2019,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Atrais"
@@ -3222,24 +3230,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencias almacenadas en {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Non se puideron subir as preferencias. Razón: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Non se puideron cargar as preferencias dende o servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3248,5 +3256,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3257,5 +3265,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3669,6 +3677,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3834,5 +3842,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3847,10 +3855,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "Carretera"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3858,15 +3866,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "Vía acuática"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3879,6 +3887,10 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+msgid "public transport"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3887,5 +3899,5 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3927,9 +3939,17 @@
 msgstr "Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+msgid "Authentication Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+msgid "Authorisation Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Maquina descoñecida"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4035,65 +4055,65 @@
 msgstr "Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opcións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Amosar esta axuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Argumento de xeometría unix estandar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Descargar a caixa de límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Descargar a caixa de límites como datos gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Seleccionar coa busca indicada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Restablecer as preferencias ós valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Establecer o idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4102,9 +4122,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4114,25 +4134,25 @@
 "que cargas algo de información antes de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En lugar de --download=<límites> debes especificar osm://<límites>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Activando extensións actualizadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Cargando extensións anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Establecendo valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Cargando extensións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4145,5 +4165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4152,5 +4172,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4258,5 +4278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4919,5 +4939,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4932,5 +4952,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4938,5 +4958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5026,5 +5046,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr ""
@@ -5204,5 +5224,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5214,5 +5234,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5307,5 +5327,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5314,5 +5334,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5395,13 +5415,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Engadir"
@@ -5533,54 +5553,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Abrir unha lista con todas as relacións."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacións: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Borrar a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Crear unha nova relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6918,58 +6938,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6977,58 +6997,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7036,9 +7056,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7046,5 +7066,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7052,15 +7072,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7068,9 +7088,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7079,5 +7099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7104,9 +7124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Básico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7116,5 +7137,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7125,5 +7146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7165,22 +7186,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7189,10 +7212,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7201,10 +7224,10 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7213,5 +7236,5 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7220,9 +7243,9 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
@@ -7251,61 +7274,57 @@
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Selección"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Seleccionar as opcións de liña do debuxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Seleccionar as opcións de liña do debuxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Seleccionar as opcións de liña do debuxo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7361,5 +7380,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7373,11 +7392,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7993,6 +8012,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9047,6 +9067,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9132,9 +9152,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9156,4 +9175,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9589,24 +9615,24 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Ficheiros GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erro durante a análise {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Non se puido ler \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9615,34 +9641,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9650,114 +9676,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9765,38 +9793,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9805,5 +9833,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9812,56 +9840,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Ler fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Atopouse un ficheiro nulo no directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erro obtendo ficheiros do directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9869,22 +9897,22 @@
 msgstr[1] "imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10073,4 +10101,567 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Usar configuración global."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autores"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+msgid "Manual"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nome de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Contrasinal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+msgid "Granted rights"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Engadir Propiedades"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autores"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Por favor, introduce unha cadea de busca."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Preferencias avanzadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Por favor, selecciona polo menos unha vía."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+msgid "Please enter an Access Token Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Por favor, seleccione como mínimo un nodo ou vía."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Non se atoparon coincidencias para \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+msgid "Close the dialog and cancel authorisation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Subir Preferencias"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+msgid "Request Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Revertir"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+msgid "Success"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Actualización fallida"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "cadea;cadea;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10103,5 +10694,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10109,5 +10700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10115,7 +10706,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Por favor seleccione a fila a borrar."
@@ -10585,13 +11176,4 @@
 msgstr "Datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Conservar ficheiros de copia de seguridade"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Ao gardar, conservar os ficheiros de copia de seguridade que rematen en ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10630,17 +11212,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Apariencia e comportamento"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Por defecto (decidido automáticamente)"
@@ -10707,10 +11284,19 @@
 msgstr "Configurar os sitios dos engadidos"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Restablecer as preferencias ós valores predeterminados"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Preferencias de Visualización"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10720,29 +11306,29 @@
 "programa."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Preferencias de Conexión"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Preferencias de conexión para o servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Preferencias do Mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Parámetros para a proxección do mapa e interpretación de datos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Preferencias de audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Parámetros para o reproductor de audio e as marcas de audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos."
@@ -10769,88 +11355,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Acción"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Preferencias do proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "A URL base do servidor OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
-"almacenar ningunha contrasinal."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL Base do Servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Contrasinal OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11151,4 +11677,254 @@
 msgstr "Grupos de modificadores"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Preferencias de Conexión"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Usar predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Conservar ficheiros de copia de seguridade"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Ao gardar, conservar os ficheiros de copia de seguridade que rematen en ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Nome de usuario OSM (correo-e)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Contrasinal OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo de "
+"preferencias.<br>O contrasinal é transferido ó servidor en texto plano, "
+"codificado na URL.<br><b>Non uses un contrasinal valioso.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Preferencias"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL Base do Servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "Valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "O valor actual é o predeterminado."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11292,5 +12068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11342,23 +12118,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11367,16 +12149,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11384,5 +12166,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11390,5 +12172,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11624,5 +12406,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11666,5 +12448,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11712,30 +12494,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11894,4 +12676,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12189,23 +12986,28 @@
 "internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Lendo {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12588,5 +13390,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12595,5 +13397,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12603,5 +13405,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12614,5 +13416,30 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12621,5 +13448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12628,5 +13455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12635,9 +13462,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12646,5 +13473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12654,5 +13481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12661,5 +13488,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12668,5 +13495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12675,10 +13502,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12687,10 +13514,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12701,5 +13528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12709,5 +13536,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12718,18 +13545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12757,4 +13571,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13134,5 +13954,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13183,5 +14003,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13190,25 +14016,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13217,13 +14041,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13231,34 +14055,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13270,18 +14094,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13289,5 +14113,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13295,44 +14119,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13445,5 +14269,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13451,14 +14275,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13466,14 +14290,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13481,21 +14305,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13604,28 +14428,28 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13636,47 +14460,47 @@
 "Crear unha nova."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13838,6 +14662,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr ""
@@ -14064,33 +14888,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr ""
@@ -14130,5 +14954,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14139,80 +14963,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14220,5 +15044,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14226,5 +15050,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14232,50 +15056,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14485,5 +15309,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14508,5 +15332,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14521,14 +15344,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14536,22 +15367,30 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14559,23 +15398,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Pechar"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Crear áreas"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Datos OpenStreetMap"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14597,10 +15464,10 @@
 msgstr "Extensión de ficheiro descoñecida: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14608,5 +15475,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14616,37 +15483,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14655,5 +15522,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14767,25 +15634,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14831,42 +15698,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -15096,37 +15963,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15134,5 +16001,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15735,5 +16602,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr ""
@@ -15747,5 +16614,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -16137,55 +17004,55 @@
 msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Nome de Menú (Predeterminado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predeterminada)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17719,6 +18586,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17744,6 +18611,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17769,6 +18636,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr ""
@@ -17794,6 +18661,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr ""
@@ -17807,5 +18674,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17823,5 +18690,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr ""
@@ -17855,6 +18722,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17888,6 +18755,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17937,5 +18804,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr ""
@@ -18921,5 +19788,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20318,7 +21185,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr ""
@@ -21046,28 +21913,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr ""
@@ -22762,4 +23629,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22794,9 +23669,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24204,7 +25079,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr ""
@@ -24274,7 +25149,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24300,5 +25175,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr ""
@@ -24594,5 +25469,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24634,5 +25509,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24742,4 +25617,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24777,5 +25658,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24848,11 +25729,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24915,5 +25796,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24969,7 +25850,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -25040,9 +25921,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -25134,5 +26015,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25146,5 +26027,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25165,10 +26046,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25178,5 +26059,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25191,5 +26072,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr ""
@@ -25203,5 +26084,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr ""
@@ -25215,5 +26096,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25402,13 +26283,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25470,7 +26351,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25493,10 +26374,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25532,7 +26413,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25578,6 +26459,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25591,5 +26472,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25611,5 +26492,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25623,5 +26504,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25683,7 +26564,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25700,5 +26581,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25713,5 +26594,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25726,5 +26607,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25739,5 +26620,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25752,5 +26633,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25765,5 +26646,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25883,11 +26764,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25901,5 +26782,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr ""
@@ -25913,5 +26794,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr ""
@@ -26055,13 +26936,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr ""
@@ -26075,5 +26956,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26169,10 +27050,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26274,14 +27155,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26677,5 +27565,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26700,23 +27588,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26748,6 +27636,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26808,8 +27696,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr ""
@@ -27162,26 +28050,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr ""
@@ -27253,8 +28141,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr ""
@@ -27325,5 +28213,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27332,5 +28220,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27340,5 +28228,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27347,5 +28235,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27355,9 +28243,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr ""
@@ -27445,14 +28333,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr ""
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27461,5 +28348,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr ""
@@ -27473,5 +28360,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27493,5 +28380,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27505,5 +28392,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr ""
@@ -27517,5 +28404,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27538,5 +28425,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27550,5 +28437,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr ""
@@ -27562,5 +28449,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27574,5 +28461,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27586,5 +28473,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27641,7 +28528,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr ""
@@ -27655,5 +28542,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr ""
@@ -27666,5 +28553,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr ""
@@ -27679,5 +28566,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr ""
@@ -27691,5 +28578,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr ""
@@ -27744,8 +28631,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27759,5 +28646,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27771,5 +28658,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27783,5 +28670,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27795,5 +28682,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr ""
@@ -27807,5 +28694,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr ""
@@ -27883,8 +28770,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr ""
@@ -27907,4 +28794,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27932,7 +28860,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr ""
@@ -28082,11 +29015,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -28134,6 +29067,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr ""
@@ -28489,4 +29422,13 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "A URL base do servidor OSM (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
+#~ "almacenar ningunha contrasinal."
+
 #~ msgid "Do not show again"
 #~ msgstr "Non amosar de novo"
@@ -28578,7 +29520,4 @@
 #~ msgstr "Data"
 
-#~ msgid "Revert"
-#~ msgstr "Revertir"
-
 #~ msgid ""
 #~ "Revert the state of all currently selected objects to the version "
@@ -28638,7 +29577,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nome de usuario OSM (correo-e)"
 
 #~ msgid "Tagging preset source"
@@ -28779,14 +29715,4 @@
 #~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/"
 #~ "TaggingPresets para obter axuda."
-
-#~ 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>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo "
-#~ "de preferencias.<br>O contrasinal é transferido ó servidor en texto "
-#~ "plano, codificado na URL.<br><b>Non uses un contrasinal valioso.</b></"
-#~ "html>"
 
 #~ msgid "Lambert Zone 4 cache file (.4)"
@@ -29013,7 +29939,4 @@
 #~ msgstr "Primitiva desaparecida"
 
-#~ msgid "Update failed"
-#~ msgstr "Actualización fallida"
-
 #~ msgid "Updating primitive"
 #~ msgstr "Actualizando primitiva"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 19246)
+++ applications/editors/josm/i18n/po/he.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,5 +12,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
 "PO-Revision-Date: 2009-10-17 15:07+0000\n"
 "Last-Translator: Tsvi Mostovicz <ttmost@gmail.com>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "יוצר ממשקי גרפי ראשי"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -297,4 +297,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "המשך"
@@ -325,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -339,7 +340,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -471,6 +475,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -549,5 +554,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -561,5 +566,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "מידע"
@@ -755,15 +760,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "מחק"
@@ -841,6 +846,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1481,14 +1486,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "מאפיינים..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "פתח את עמוד ההעדפות להגדרות כלליות."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "העדפות"
@@ -1632,17 +1638,17 @@
 msgstr "עזרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "דו\"ח מצב"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "העתק ללוח הגזירים וסגור"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1775,43 +1781,43 @@
 msgstr "הנקודה לא מוצמדת לשום דבר אחר."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "בחר:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* נקודה אחת המשותפת ליותר מדרך אחת ואחת מהדרכים הללו, או"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* דרך אחת בעלת אחת או יותר נקודות המשותפות ליותר מדרך אחת, או"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "* דרך אחת ונקודה אחת או יותר שלה המשותפות ליותר מדרך אחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1821,9 +1827,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "הפרד נקודה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1831,5 +1837,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1994,4 +2000,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "חזרה"
@@ -3183,24 +3191,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "מאפיינים נשמרו ב {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "לא יכול להעלות מאפיינים. סיבה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "לא יכול לטעון מאפיינים משרת."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3209,5 +3217,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3218,5 +3226,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3630,6 +3638,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3795,5 +3803,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3808,10 +3816,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "כביש ראשי"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3819,15 +3827,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "נתיב מים"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3840,6 +3848,11 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "תחבורה ציבורית"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3848,5 +3861,5 @@
 msgstr[1] "{0} חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3888,9 +3901,19 @@
 msgstr "התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "ההתחברות נכשלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "ההתחברות נכשלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "מארח לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -3996,65 +4019,65 @@
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "קבע את השפה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4063,9 +4086,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4073,25 +4096,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "מפעיל תוספים מעודכנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4104,5 +4127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4111,5 +4134,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4217,5 +4240,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4881,5 +4904,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4894,5 +4917,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4900,5 +4923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4988,5 +5011,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "כלום"
@@ -5166,5 +5189,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5176,5 +5199,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5269,5 +5292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5276,5 +5299,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5355,13 +5378,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "הוסף"
@@ -5492,54 +5515,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "יחסים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "פתח רשימה של כל היחסים."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "יחסים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "פתח עורך עבור היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "מחק את היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "צור יחס חדש"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6874,58 +6897,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6933,58 +6956,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6992,9 +7015,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7002,5 +7025,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7008,15 +7031,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7024,9 +7047,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7035,5 +7058,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7060,9 +7083,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "בסיסי"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7072,5 +7096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7081,5 +7105,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7121,22 +7145,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7145,10 +7171,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7157,10 +7183,10 @@
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "לשנות ערכים?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7169,5 +7195,5 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7176,9 +7202,9 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "נא בחר ערך"
@@ -7206,61 +7232,57 @@
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "בחירה"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "בחר אפשרויות ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "בחר אפשרויות ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "בחר אפשרויות ציור קו"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7316,5 +7338,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7328,11 +7350,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7944,6 +7966,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8985,6 +9008,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9070,9 +9093,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9094,4 +9116,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9527,24 +9556,24 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "שגיאה בעת ניתוח {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "לא ניתן לקרוא את \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9553,34 +9582,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "זמן צילום (מ-EXIF)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "זמן GPS (נקרא מהצילום למעלה): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "אני באזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "אין תאריך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "פתח תמונה אחרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9588,114 +9617,116 @@
 msgstr "שגיאה בזמן ניתוח התאריך:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "תאריך שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "אזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "היסט:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "אזור זמן שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "היסט שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9703,38 +9734,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9745,5 +9776,5 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9754,56 +9785,56 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "מחלץ מיקומי GPS מ-EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "מתחיל סריקת ספרייה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "קורא תמונות..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "קורא {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "קורא ספרייה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "נמצא קובץ null בתיקייה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9811,22 +9842,22 @@
 msgstr[1] "תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10013,4 +10044,575 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "השתמש בהגדרות הגלובליות."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "מחברים"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "תעלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "שם משתמש"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "סיסמא"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "סובב ימינה"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "הוסף תכונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "מחברים"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "הזן שם משתמש"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "הזן שם משתמש"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "גישה"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "מאפיינים מתקדמים"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "הזן שם משתמש"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "הזן שם משתמש"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "נא לבחור לפחות נקודה אחת או דרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "לא נמצאה התאמה עבור \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+msgid "Close the dialog and cancel authorisation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "העלה מאפיינים"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "בקש עדכון"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "מסעדה"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "נקודת גישה בחירום"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "גישה"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "עדכון נכשל"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "מחרוזת;מחרוזת;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10043,5 +10645,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10049,5 +10651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10055,7 +10657,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "נא בחר את השורה למחיקה."
@@ -10490,12 +11092,4 @@
 msgstr "נתוני OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "שמור קובצי גיבוי"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "בזמן שמירה, שמור קובצי גיבוי המסתיימים ב ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10534,17 +11128,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "מראה ומרגש"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "שפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "ברירת מחדל (נקבע אוטומטית)"
@@ -10611,10 +11200,19 @@
 msgstr "התאם אתרי תוספים"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "הגדרות תצוגה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10622,29 +11220,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "הגדרות חיבור"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "הגדרות חיבור לשרת OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "הגדרות מפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "הגדרות שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף."
@@ -10671,86 +11269,28 @@
 msgstr "לא ניתן להפעיל היטל {0}. משתמש במרקטור"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "יעד"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "הגדרות פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "כתובת שרת הבסיס"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "סיסמת OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11026,4 +11566,252 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "ההתחברות נכשלה."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "השתמש בברירת המחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "שמור קובצי גיבוי"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "בזמן שמירה, שמור קובצי גיבוי המסתיימים ב ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "שם משתמש OSM (אי-מייל)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "סיסמת OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.<br>הסיסמא נשלחת "
+"בצורה לא מוצפנת לשרת, מקודדת בכתובת.<br><b>אל תשתמש בסיסמא בעלת ערך.</b></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "העדפות"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "כתובת שרת הבסיס"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "בדוק תקינות"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "ערך נוכחי הינו ברירת מחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11167,5 +11955,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11217,23 +12005,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11242,16 +12036,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11259,5 +12053,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11265,5 +12059,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11497,5 +12291,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11539,5 +12333,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11585,30 +12379,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11767,4 +12561,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12060,23 +12869,28 @@
 msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "קורא {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12455,5 +13269,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12462,5 +13276,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12470,5 +13284,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12478,5 +13292,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12485,5 +13324,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12492,5 +13331,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12499,9 +13338,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12510,5 +13349,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12518,5 +13357,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12525,5 +13364,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12532,5 +13371,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12539,10 +13378,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12551,10 +13390,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12565,5 +13404,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12573,5 +13412,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12582,18 +13421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12620,4 +13446,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13004,5 +13836,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13053,5 +13885,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13060,25 +13898,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "בחר מ..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "בחר מ..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13087,13 +13923,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13101,34 +13937,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "קבע רקע שקוף."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13140,18 +13976,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "מקור"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13159,5 +13995,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13165,44 +14001,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13313,5 +14149,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13319,14 +14155,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13334,14 +14170,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13349,21 +14185,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13472,28 +14308,28 @@
 msgstr "שכבה ריקה"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13502,47 +14338,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "שימוש"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "סכמת צבעים"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "בחר סכמה למחיקה."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "השתמש בסכמה הנבחרת מהרשימה."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "השתמש בצבעים הנוכחיים כסכמת הצבעים החדשה"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "מחק את הסכמה הנבחרת מהרשימה"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "סכמות צבעים"
@@ -13704,6 +14540,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "רענן"
@@ -13930,33 +14766,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "מזרח"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "צפון-מזרח"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "צפון"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "צפון-מערב"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "מערב"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "דרום-מערב"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "דרום"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "דרום-מזרח"
@@ -13996,5 +14832,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14005,80 +14841,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "מים"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "קו חוף"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "אדמה"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "מספר מירבי של קטעים בדרך"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "ערך אפור מירבי שנחשב כ\"מים\" (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "דיוק הפשטת קו (מעלות)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "כיוון לחיפוש אדמה"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "תייג אדמה כ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "שכבת WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "גודל מטמון מירבי (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "גיל מטמון מירבי (ימים)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "טקסט מקור"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14087,5 +14923,5 @@
 "מספר מירבי של נקודות לייצור לפני חילוץ (לפני פישוט קווים). ברירת מחדל 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14093,5 +14929,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14101,50 +14937,50 @@
 "נקודות, וקווים מדוייקים יותר. ברירת מחדל 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "הסט כל הנקודות בכיוון מזרח (מעלות). ברירת מחדל 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "הסט כל הנקודות בכיוון צפון (מעלות). ברירת מחדל 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "כיוון לחיפוש אדמה. ברירת המחדל היא מזרח."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "תייג דרכים כמים, קו חוף, אדמה או כלום. ברירת המחדל היא מים."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "הגיל המירבי לכל ספריית מטמון בימים. ברירת המחדל היא 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14354,5 +15190,5 @@
 msgstr "לולאת הורדה של OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14377,5 +15213,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14390,14 +15225,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "פתח את OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14405,22 +15248,30 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "הוסף תגובה"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "הכנס את התגובה שלך"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "סמן כהושלם"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "באמת לסגור?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14428,23 +15279,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "סגור"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "פריט חדש"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "צור פריט"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "תאר את הבעיה בדיוק"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "צור אזורים"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "הזן שם משתמש"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "מצב פריט לא ידוע"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "פתח את OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14466,10 +15345,10 @@
 msgstr "סיומת קובץ לא מוכרת: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14478,5 +15357,5 @@
 "Firefox לא נמצא. קבע את קובץ ההרצה של Firefox בדף Map Settings של המאפיינים."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "קובץ הרצת פיירפוקס"
@@ -14486,37 +15365,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "טען נתונים מ API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "שנה את הבחירה"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "שנה נקודת מבט"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "אשר את כל פעולות השלט רחוק ידנית"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "כיוונונים לתוסף \"שלט רחוק\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14527,5 +15406,5 @@
 "לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "פעולות מורשות"
@@ -14639,25 +15518,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14703,42 +15582,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "מיקוד אוטומטי"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "טען משטחים אוטומטית"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "מקורות משטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "מיקוד אוטומטי: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "טען משטחים אוטומטית: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "רמת מיקוד מירבית: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -14970,37 +15849,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "השתמש ברשימת התעלמות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "השתמש ברשימת התעלמות לדיכוי הזהרות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "השתמש בשכבת שגיאות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "השתמש בשכבת שגיאות להצגת אלמנטים בעייתיים."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "לפי דרישה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "בטעינה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15008,5 +15887,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "בודק תקינות נתונים"
@@ -15608,5 +16487,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "בניין"
@@ -15620,5 +16499,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "שטח"
@@ -16010,55 +16889,55 @@
 msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "מאפייני תוסף WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "שם תפריט"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "כתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "שם תפריט (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "כתובת WMS (ברירת מחדל)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "הזן שם תפריט וכתובת WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17594,6 +18473,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17619,6 +18498,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17644,6 +18523,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "ראשי"
@@ -17669,6 +18548,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "משני"
@@ -17682,5 +18561,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "שלישוני"
@@ -17698,5 +18577,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "מגורים"
@@ -17730,6 +18609,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "שירות"
@@ -17763,6 +18642,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "בנייה"
@@ -17812,5 +18691,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "כיכר"
@@ -18796,5 +19675,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "ביצה"
@@ -20193,7 +21072,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "רחוב"
@@ -20921,28 +21800,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "ספורט"
@@ -22637,4 +23516,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22669,9 +23556,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "ירוק"
@@ -24079,7 +24966,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "אופניים"
@@ -24149,7 +25036,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "רגל"
@@ -24175,5 +25062,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "רכבת תחתית"
@@ -24469,5 +25356,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "מיושן"
@@ -24509,5 +25396,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "סוס"
@@ -24617,4 +25504,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24652,5 +25545,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24723,11 +25616,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24790,5 +25683,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24844,7 +25737,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24915,9 +25808,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -25009,5 +25902,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25021,5 +25914,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25040,10 +25933,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25053,5 +25946,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25066,5 +25959,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "גדת נחל"
@@ -25078,5 +25971,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "זרם"
@@ -25090,5 +25983,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25277,13 +26170,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "מעשה אדם"
@@ -25345,7 +26238,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25368,10 +26261,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25407,7 +26300,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25453,6 +26346,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25466,5 +26359,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "מסוף"
@@ -25486,5 +26379,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25498,5 +26391,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25558,7 +26451,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25575,5 +26468,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "מסלול קל"
@@ -25588,5 +26481,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "מסלול בינוניים"
@@ -25601,5 +26494,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "מסלול מתקדמים"
@@ -25614,5 +26507,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25627,5 +26520,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25640,5 +26533,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "מסלול מתחילים"
@@ -25758,11 +26651,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "תחנת כח"
@@ -25776,5 +26669,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "מזח"
@@ -25788,5 +26681,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "צינור"
@@ -25930,13 +26823,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "פנאי"
@@ -25950,5 +26843,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26044,10 +26937,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26149,14 +27042,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26552,5 +27452,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26575,23 +27475,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26623,6 +27523,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26683,8 +27583,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "בריאות"
@@ -27037,26 +27937,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "חנות"
@@ -27128,8 +28028,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "מלון"
@@ -27200,5 +28100,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27207,5 +28107,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27215,5 +28115,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27222,5 +28122,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27230,9 +28130,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "תיירות"
@@ -27320,14 +28220,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "היסטורי"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27336,5 +28235,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "מחצבה"
@@ -27348,5 +28247,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27368,5 +28267,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27380,5 +28279,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "יער"
@@ -27392,5 +28291,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27413,5 +28312,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "קמעוני"
@@ -27425,5 +28324,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "תעשייתי"
@@ -27437,5 +28336,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27449,5 +28348,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27461,5 +28360,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27516,7 +28415,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "צבאי"
@@ -27530,5 +28429,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -27541,5 +28440,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "פיסגה"
@@ -27554,5 +28453,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "קרחון"
@@ -27566,5 +28465,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "הר געש"
@@ -27619,8 +28518,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "טבעי"
@@ -27634,5 +28533,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27646,5 +28545,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27658,5 +28557,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27670,5 +28569,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "בוץ"
@@ -27682,5 +28581,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "חוף"
@@ -27758,8 +28657,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr ""
@@ -27782,4 +28681,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27807,7 +28747,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "גבול"
@@ -27957,11 +28902,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "מקום"
@@ -28009,6 +28954,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "כתובת"
@@ -28364,4 +29309,8 @@
 msgstr ""
 
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
+
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -28610,7 +29559,4 @@
 #~ msgid "Read GPX..."
 #~ msgstr "קורא GPX..."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "שם משתמש OSM (אי-מייל)"
 
 #~ msgid "Plugin already exists"
@@ -28759,10 +29705,4 @@
 #~ msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת"
 
-#~ msgid "Validate"
-#~ msgstr "בדוק תקינות"
-
-#~ msgid "Request Update"
-#~ msgstr "בקש עדכון"
-
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "סנכרן את השעה עם יחידת ה-GPS"
@@ -28831,13 +29771,4 @@
 #~ msgstr "מחק שכבה"
 
-#~ 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>הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.<br>הסיסמא "
-#~ "נשלחת בצורה לא מוצפנת לשרת, מקודדת בכתובת.<br><b>אל תשתמש בסיסמא בעלת ערך."
-#~ "</b></html>"
-
 #~ msgid "Combine Anyway"
 #~ msgstr "אחד בכל זאת"
@@ -28898,7 +29829,4 @@
 #~ msgid "Update Selection"
 #~ msgstr "עדכן בחירה"
-
-#~ msgid "Update failed"
-#~ msgstr "עדכון נכשל"
 
 #~ msgid "Selection too big"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 19246)
+++ applications/editors/josm/i18n/po/is.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-11-24 12:07+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:18+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -293,4 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Halda áfram"
@@ -321,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -335,7 +336,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -468,6 +472,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -546,5 +551,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -558,5 +563,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Upplýsingar"
@@ -755,15 +760,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Fjarlægja"
@@ -841,6 +846,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1481,14 +1486,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Stillingar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Sýna stillingar fyrir ritilinn."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Stillingar"
@@ -1631,17 +1637,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Stöðuskýrsla"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Afrita á klemmuborðið og loka"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1783,43 +1789,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1829,9 +1835,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1839,5 +1845,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2002,4 +2008,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr ""
@@ -3193,24 +3201,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Gat ekki hlaðið upp stillingunum. Ástæðan er: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3219,5 +3227,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3228,5 +3236,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3640,6 +3648,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3805,5 +3813,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3818,10 +3826,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3829,15 +3837,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3850,6 +3858,11 @@
 msgstr[1] "{0} hnútar"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Almenningssamgöngur"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3858,5 +3871,5 @@
 msgstr[1] "{0} stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3898,9 +3911,17 @@
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+msgid "Authentication Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+msgid "Authorisation Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4000,65 +4021,65 @@
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4067,9 +4088,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4077,25 +4098,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Virki uppfærðar viðbætur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4108,5 +4129,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4115,5 +4136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4221,5 +4242,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4877,5 +4898,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4890,5 +4911,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4896,5 +4917,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4984,5 +5005,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr ""
@@ -5162,5 +5183,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5172,5 +5193,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5265,5 +5286,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5272,5 +5293,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5351,13 +5372,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Bæta við"
@@ -5488,54 +5509,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Sýna lista yfir vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Vensl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Opna ritil til að breyta völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Eyða völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Skapa ný vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6872,58 +6893,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6931,58 +6952,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6990,9 +7011,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7000,5 +7021,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7006,15 +7027,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7022,9 +7043,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7033,5 +7054,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7058,9 +7079,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Grunnupplýsingar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7070,5 +7092,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7079,5 +7101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7119,22 +7141,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7143,10 +7167,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7155,10 +7179,10 @@
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7167,5 +7191,5 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7174,9 +7198,9 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Veldu gildi"
@@ -7204,60 +7228,57 @@
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Eigindi & vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Val"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Sýna kenni hluta í vallistum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Sýna kenni hluta í vallistum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7315,5 +7336,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7327,12 +7348,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "Sæki viðbótina {0}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -7947,6 +7968,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8990,6 +9012,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9079,9 +9101,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9103,4 +9124,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9530,24 +9558,24 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX skrár (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9556,34 +9584,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9591,114 +9619,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9706,38 +9736,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9746,5 +9776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9753,56 +9783,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Les {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9810,22 +9840,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10007,4 +10037,568 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
 msgid "Illegal dash pattern, at least one value must be > 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Nota tugabrotsgráður."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Höfundar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Skipaskurður"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Notandanafn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Lykilorð"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+msgid "Granted rights"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Bæti vað eigindum"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Höfundar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Sláðu inn leitarstreng"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Aðgangur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Stillingarritill"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+msgid "Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+msgid "Please enter an Access Token Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Veldu minnst einn hnút eða veg."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+msgid "Close the dialog and cancel authorisation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Hlaða upp stillingum"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Smásala"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Veitingastaður"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Aðgangur"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+msgid "Test failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+msgid "Retrieving user info..."
 msgstr ""
 
@@ -10038,5 +10632,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10044,5 +10638,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10050,7 +10644,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Veldu hlut til að eyða fyrst."
@@ -10489,12 +11083,4 @@
 msgstr "OSM gögn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10533,17 +11119,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Útlit og viðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Tungumál"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr ""
@@ -10610,10 +11191,18 @@
 msgstr "Stilla viðbótarþjóna"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+msgid "Save the preferences and close the dialog"
+msgstr ""
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Birtingarstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10621,29 +11210,29 @@
 msgstr "Stillingar sem hafa áhrif á útlit forritsins"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Tengistillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Stillingar sem þarf til að tengjast OSM þjóninum."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Kortastillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Stillingar tengdar kortavörpun og gagnatúlkun."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Hljóðstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -10671,87 +11260,28 @@
 msgstr "Ekki var hægt að virkja vörpunina „{0}“. Nota Meracator í staðin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Hringtorg"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Stillingar milliþjóns"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Notandanafn (eða netfang) á OSM þjóninum."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Slóð OSM þjóns"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM notandanafn (netfang)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM lykilorð"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11027,4 +11557,246 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM notandanafn (getur verið tölvupóstfang)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM lykilorð"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Stillingar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Slóð OSM þjóns"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Athuga"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+msgid "The current value isn't a valid URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11168,5 +11940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11218,23 +11990,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11243,16 +12021,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11260,5 +12038,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11266,5 +12044,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11496,5 +12274,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11538,5 +12316,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11584,30 +12362,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11766,4 +12544,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12060,23 +12853,28 @@
 "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Les {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12455,5 +13253,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12462,5 +13260,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12470,5 +13268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12478,5 +13276,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12485,5 +13308,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12492,5 +13315,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12499,9 +13322,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12510,5 +13333,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12518,5 +13341,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12525,5 +13348,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12532,5 +13355,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12539,10 +13362,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12551,10 +13374,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12565,5 +13388,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12573,5 +13396,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12582,18 +13405,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12620,4 +13430,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13004,5 +13820,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13053,5 +13869,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13060,25 +13882,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13087,13 +13907,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13101,34 +13921,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13140,18 +13960,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13159,5 +13979,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13165,44 +13985,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13313,5 +14133,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13319,14 +14139,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13334,14 +14154,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13349,21 +14169,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13472,28 +14292,28 @@
 msgstr "Tómt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13502,47 +14322,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13704,6 +14524,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Uppfæra"
@@ -13930,33 +14750,33 @@
 msgstr "Óþekkt villa kom upp"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr ""
@@ -13996,5 +14816,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14005,80 +14825,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "vatn"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "strandlengja"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS lag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14086,5 +14906,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14092,5 +14912,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14098,50 +14918,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14351,5 +15171,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Sýna OpenStreetBugs pöddur"
@@ -14374,5 +15194,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14387,14 +15206,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs pöddur"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14402,22 +15229,30 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Bæta við athugasemd"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Merkja sem klárað"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14425,23 +15260,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Loka"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Ný padda"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Búa til pöddu"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Lýstu vandamálinu nákvæmlega"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Búa til svæði"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugs pöddur"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14463,10 +15326,10 @@
 msgstr "Óþekkt skráarending: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14474,5 +15337,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14482,37 +15345,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "búa til nýja hluti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14521,5 +15384,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14633,25 +15496,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14697,42 +15560,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -14962,37 +15825,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15000,5 +15863,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15598,5 +16461,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "bygging"
@@ -15610,5 +16473,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -16000,55 +16863,55 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Stillingar fyrir WMS viðbótina"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Niðurhalsforrit:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17582,6 +18445,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "hraðbraut"
@@ -17607,6 +18470,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "stofnvegur"
@@ -17632,6 +18495,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr ""
@@ -17657,6 +18520,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr ""
@@ -17670,5 +18533,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17686,5 +18549,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "íbúðargata"
@@ -17718,6 +18581,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "þjónustuvegur"
@@ -17751,6 +18614,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -17800,5 +18663,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "hringtorg"
@@ -18784,5 +19647,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20181,7 +21044,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "stræti"
@@ -20909,28 +21772,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "íþrótt"
@@ -22625,4 +23488,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22657,9 +23528,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24067,7 +24938,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "hjól"
@@ -24137,7 +25008,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "fótgangandi"
@@ -24163,5 +25034,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr ""
@@ -24457,5 +25328,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24497,5 +25368,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24605,4 +25476,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24640,5 +25517,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24711,11 +25588,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24778,5 +25655,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24832,7 +25709,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24903,9 +25780,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -24997,5 +25874,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "vegþjónustur"
@@ -25009,5 +25886,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25028,10 +25905,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "beygjuhringur"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25041,5 +25918,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25054,5 +25931,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "árbakki"
@@ -25066,5 +25943,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "lækur"
@@ -25078,5 +25955,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25265,13 +26142,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25333,7 +26210,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25356,10 +26233,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25395,7 +26272,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25441,6 +26318,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25454,5 +26331,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25474,5 +26351,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25486,5 +26363,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25546,7 +26423,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "skíðalyfta"
@@ -25563,5 +26440,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25576,5 +26453,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25589,5 +26466,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25602,5 +26479,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25615,5 +26492,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25628,5 +26505,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25746,11 +26623,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25764,5 +26641,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "bryggja"
@@ -25776,5 +26653,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "leiðsla"
@@ -25918,13 +26795,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "frístundir"
@@ -25938,5 +26815,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "smábátahöfn"
@@ -26032,10 +26909,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26137,14 +27014,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26540,5 +27424,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26563,23 +27447,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26611,6 +27495,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26671,8 +27555,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr ""
@@ -27025,26 +27909,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr ""
@@ -27116,8 +28000,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hótel"
@@ -27188,5 +28072,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27195,5 +28079,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27203,5 +28087,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27210,5 +28094,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27218,9 +28102,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "ferðamennska"
@@ -27308,14 +28192,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr ""
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27324,5 +28207,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr ""
@@ -27336,5 +28219,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27356,5 +28239,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27368,5 +28251,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -27380,5 +28263,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27401,5 +28284,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "smásala"
@@ -27413,5 +28296,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "iðnaður"
@@ -27425,5 +28308,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27437,5 +28320,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27449,5 +28332,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27504,7 +28387,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr ""
@@ -27518,5 +28401,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr ""
@@ -27529,5 +28412,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "tindur"
@@ -27542,5 +28425,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "jökul"
@@ -27554,5 +28437,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "eldfjall"
@@ -27607,8 +28490,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27622,5 +28505,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27634,5 +28517,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27646,5 +28529,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27658,5 +28541,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "leðja"
@@ -27670,5 +28553,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "strönd"
@@ -27746,8 +28629,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr ""
@@ -27770,4 +28653,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27795,7 +28719,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr ""
@@ -27945,11 +28874,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -27997,6 +28926,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr ""
@@ -28352,4 +29281,16 @@
 msgstr ""
 
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Notandanafn (eða netfang) á OSM þjóninum."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki "
+#~ "lykilorðið."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "OSM notandanafn (netfang)"
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
@@ -28363,7 +29304,4 @@
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
 
 #~ msgid "Proxy server host"
@@ -28543,7 +29481,4 @@
 #~ msgstr "Breytingaskrá hluts"
 
-#~ msgid "Validate"
-#~ msgstr "Athuga"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Athuga núverandi val eða öll gögn í laginu."
@@ -28699,7 +29634,4 @@
 #~ "<br>Eyða úr venslunum?</html>"
 
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
-
 #~ msgid "Display the history of the selected primitive."
 #~ msgstr "Sýna breytingasögu valdra hluta"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 19246)
+++ applications/editors/josm/i18n/po/it.po	(revision 19319)
@@ -2,4 +2,5 @@
 # License: GPL
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -8,7 +9,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 20:45+0000\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-06 20:32+0000\n"
+"Last-Translator: FabC <f.carrai@iol.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +17,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Creazione dell'interfaccia principale"
@@ -85,9 +86,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -114,5 +115,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -120,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -131,9 +132,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -172,5 +173,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -198,6 +198,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -298,4 +298,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Continua"
@@ -304,5 +305,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Click per continuare ed aprire {0} visualizzatori"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
@@ -326,5 +327,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -340,7 +341,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -361,5 +365,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Click per annullare l'esecuzione dei visualizzatori esterni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -475,6 +479,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -553,5 +558,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -565,5 +570,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informazioni"
@@ -609,5 +614,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:168
 msgid "Nothing selected to zoom to."
-msgstr "Nessuna selezione da ingrandire"
+msgstr "Nessuna selezione su cui ingrandire la visuale"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:88
@@ -615,10 +620,10 @@
 #, java-format
 msgid "Zoom to {0}"
-msgstr "Zoom a {0}"
+msgstr "Ingrandisci visuale su {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:88
 #, java-format
 msgid "Zoom the view to {0}."
-msgstr "Fa lo zoom della vista a {0}"
+msgstr "Ingrandisci la visuale su {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
@@ -632,9 +637,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:168
 msgid "No conflicts to zoom to"
-msgstr "Nessun conflitto da ingrandire"
+msgstr "Nessun conflitto su cui ingrandire la visuale"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr ""
+msgstr "Gestore gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
@@ -642,4 +647,5 @@
 msgid "Toggle visibility of Changeset Manager window"
 msgstr ""
+"Commuta la visibilità della finestra del gestore dei gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
@@ -764,15 +770,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Cancella"
@@ -852,6 +858,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1068,5 +1074,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125
 msgid "Please select at least one closed way that should be joined."
-msgstr ""
+msgstr "Selezionare almeno un percorso chiuso che dovrebbe essere unito."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
@@ -1199,5 +1205,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
 msgid "Zoom (in metres)"
-msgstr "Zoom (in metri)"
+msgstr "Ingrandimento visuale (in metri)"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
@@ -1217,6 +1223,6 @@
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
-"Non è possibile interpretare la Latitudine, la Longitudine o lo Zoom. "
-"Verifica."
+"Non è possibile interpretare la latitudine, la longitudine o "
+"l'ingrandimento. Si prega di controllare."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1355,18 +1361,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:118
 msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr ""
+msgstr "<html>Impossibile aprire una cartella.<br>Selezionare un file!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
 msgid "Open file"
-msgstr ""
+msgstr "Apri file"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Apertura di 1 file..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
 #, java-format
 msgid "Opening {0} files..."
-msgstr ""
+msgstr "Apertura di {0} file..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1515,14 +1521,15 @@
 msgstr[1] "a {0} primitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Preferenze..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
-msgstr "Apre una pagina di preferenze per le impostazioni globali."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
+msgstr "Apri una pagina di preferenze per le impostazioni globali."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Preferenze"
@@ -1669,17 +1676,17 @@
 msgstr "Aiuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Rapporto dello stato"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Copia negli appunti e chiudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1825,34 +1832,34 @@
 msgstr "Questo nodo non è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Nessuno di questi nodi è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selezione corrente non può essere utilizzata per la separazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selezionare uno di questi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Un nodo etichettato, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo che è usato da più di un percorso, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1861,5 +1868,5 @@
 "oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1868,5 +1875,5 @@
 "percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1881,9 +1888,9 @@
 "e tutti i nodi saranno selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nodo staccato"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1891,5 +1898,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1943,5 +1950,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Aggiorna oggetti modificati"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -1949,4 +1956,6 @@
 "Updates the currently modified objects from the server (re-downloads data)"
 msgstr ""
+"Aggiorna dal server gli oggetti correntemente modificati (scarica nuovamente "
+"i dati)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
@@ -2061,4 +2070,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Indietro"
@@ -2432,9 +2443,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 msgid "Zoom"
-msgstr "Zoom"
+msgstr "Ingrandimento"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 msgid "Zoom and move map"
-msgstr "Ridimensiona e muovi la mappa"
+msgstr "Ridimensiona visuale e muovi la mappa"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73
@@ -2557,4 +2568,6 @@
 "assigned version)"
 msgstr ""
+"<b>version:</b>... - oggetto con una determinata versione (0 oggetti a cui "
+"non è stata assegnata una versione)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2563,4 +2576,6 @@
 "assigned changeset)"
 msgstr ""
+"<b>changeset:</b>... - oggetto con un determinato identificativo del gruppo "
+"di modifiche (0 oggetti a cui non è stato assegnato un gruppo di modifiche)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
@@ -2569,4 +2584,6 @@
 "min-max)"
 msgstr ""
+"<b>nodes:</b>... - oggetto con un determinato numero di nodi (nodes:numero "
+"oppure nodes:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
@@ -2583,4 +2600,6 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
+"<b>timestamp:</b>... -  oggetti con questa marcatura temporale (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> oppure <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
@@ -2726,13 +2745,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 msgid "Missing parameter for OR"
-msgstr ""
+msgstr "Parametro mancante per OR"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:636
 msgid "Missing right parenthesis"
-msgstr ""
+msgstr "Parentesi chiusa mancante"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:639
 msgid "Missing operator for NOT"
-msgstr ""
+msgstr "Operatore mancante per NOT"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:688
@@ -2771,4 +2790,6 @@
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
 msgstr ""
+"Valore non corretto dell''operatore del gruppo di modifiche: {0}. Era atteso "
+"un numero."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
@@ -2776,4 +2797,6 @@
 msgid "Incorrect value of version operator: {0}. Number is expected."
 msgstr ""
+"Valore non corretto dell''operatore della versione: {0}. Era atteso un "
+"numero."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
@@ -3044,15 +3067,15 @@
 #, java-format
 msgid "Set the 'modified' flag for node {0}"
-msgstr ""
+msgstr "Imposta il contrassegno ''modificato'' per il nodo {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
 #, java-format
 msgid "Set the 'modified' flag for way {0}"
-msgstr ""
+msgstr "Imposta il contrassegno ''modificato'' per il percorso {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
 #, java-format
 msgid "Set the 'modified' flag for relation {0}"
-msgstr ""
+msgstr "Imposta il contrassegno ''modificato'' per la relazione {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
@@ -3236,10 +3259,10 @@
 #, java-format
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "Valore ''''{0}'''' non valido per la latitudine"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
 #, java-format
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "Valore ''''{0}'''' non valido per la longitudine"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
@@ -3354,19 +3377,19 @@
 "''''{1}'''' nel file di segnalibro ''''{2}''''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferenze salvate in {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Impossibile caricare le preferenze. Motivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Impossibile scaricare le preferenze dal server."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
@@ -3375,5 +3398,5 @@
 "proveniente dal server"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3384,5 +3407,5 @@
 "''''{1}'''' nella lista dei segnalibri proveniente dal server"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3395,6 +3418,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Fallito il caricamento della risorsa ''''{0}'''', l''errore è {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3586,5 +3609,5 @@
 #, java-format
 msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr ""
+msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
@@ -3594,4 +3617,6 @@
 "{0}"
 msgstr ""
+"Impossibile assegnare un identificativo del gruppo di modifiche  > 0 ad una "
+"nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
@@ -3824,6 +3849,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3990,8 +4015,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
+msgstr "Non visualizzare nuovamente (ricorda la scelta)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -4006,10 +4031,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "strada"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -4017,15 +4042,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "corso d'acqua"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "tipologia di area"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -4038,6 +4063,11 @@
 msgstr[1] "{0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Trasporto pubblico"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -4046,5 +4076,5 @@
 msgstr[1] "{0} membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4086,9 +4116,19 @@
 msgstr "Conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Connessione fallita"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Connessione fallita"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Host sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Oggetto eliminato"
@@ -4118,4 +4158,6 @@
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Era atteso un valore non vuoto per il parametro ''''{0}'''', ottenuto "
+"''''{1}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -4157,6 +4199,6 @@
 "filename"
 msgstr ""
-"Scarica ognuna. Può essere x1,y1,x2,y2 un url contenente lat=y&lon=x&zoom=z "
-"o un nome di file"
+"Scarica ognuna. Può essere x1,y1,x2,y2 un indirizzo URL contenente "
+"lat=y&lon=x&zoom=z oppure un nome di file"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
@@ -4165,6 +4207,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Scarica ognuna come GPS grezzo. Può essere x1,y1,x2,y2 un url contenente "
-"lat=y&lon=x&zoom=z o un nome di file"
+"Scarica ognuna come GPS grezzo. Può essere x1,y1,x2,y2 un indirizzo URL "
+"contenente lat=y&lon=x&zoom=z oppure un nome di file"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4194,66 +4236,66 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Scarica la zona indicata dall'URL (interpretando lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Apri il file (come gps grezzo se .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Imposta la lingua."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "opzioni fornite come proprietà di sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Cambia la cartella per tutte le impostazioni utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4266,9 +4308,9 @@
 "allocata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4278,25 +4320,25 @@
 "quindi assicurati di caricare dei dati prima di indicare una selezione."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Invece di --download=<zona> puoi utilizzare osm://<zona>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Attivazione estensioni aggiornate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4311,5 +4353,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4318,5 +4360,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4427,5 +4469,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Utente:"
@@ -5142,5 +5184,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5155,5 +5197,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5161,5 +5203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5253,5 +5295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "nessuno"
@@ -5445,6 +5487,12 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
-msgstr ""
+"place of the original way in the relation.</html>"
+msgstr ""
+"<html>Le strade che sono state combinate sono membri di una o più relazioni. "
+"Decidere se si vuole <strong>mantenere</strong> queste appartenenze o se "
+"desidera <strong>rimuoverle</strong>.<br>Il default è di <strong>mantenere</"
+"strong> la prima strada e <strong>rimuovere</strong> le altre strade che "
+"sono membri della stessa relazione: la combinazione delle strade rimpiazzerà "
+"la strada originale nella relazione.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5455,5 +5503,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5481,5 +5529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:168
 msgid "For selected objects only"
-msgstr ""
+msgstr "Solamente per gli oggetti selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:169
@@ -5489,17 +5537,23 @@
 "html>"
 msgstr ""
+"<html>Selezionare per visualizzare i gruppi di modifiche relativi solamente "
+"agli oggetti correntemente selezionati.<br>Deselezionare per visualizzare "
+"tutti i gruppi di modifiche per gli oggetti presenti nel livello dei dati "
+"corrente.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:260
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:262
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Apri la lista dei gruppi di modifiche nel livello corrente."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:307
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
+"Seleziona tutti gli oggetti assegnati ai gruppi di modifiche correntemente "
+"selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:366
@@ -5512,8 +5566,10 @@
 msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
+"Scarica dal server OSM le informazioni riguardanti i gruppi di modifiche "
+"selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:402
 msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Chiude i gruppi di modifiche aperti selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:433
@@ -5524,13 +5580,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:434
 msgid "Open a web page for each selected changeset"
-msgstr ""
+msgstr "Apri una pagina web per ogni gruppo di modifiche selezionato"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:473
 msgid "Details"
-msgstr ""
+msgstr "Dettagli"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:474
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr ""
+"Apre la finestra del gestore dei gruppi di modifiche per i gruppi di "
+"modifiche selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5550,5 +5608,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5557,5 +5615,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5638,13 +5696,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Aggiungi"
@@ -5734,9 +5792,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 msgid "Open a list of all loaded layers."
-msgstr "Apre la lista di tutti i livello caricati."
+msgstr "Apre la lista di tutti i livelli caricati."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
 msgid "Delete the selected layers."
-msgstr ""
+msgstr "Elimina i livelli selezionati."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
@@ -5775,33 +5833,33 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
-msgstr "Apri tutte le relazioni in una lista"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+msgstr "Apri una lista di tutte le relazioni"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relazioni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Apri le relazioni selezionate in un editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Cancella le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Crea una nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5809,21 +5867,21 @@
 "Crea una copia di questa relazione e aprila in un'altra finestra dell'editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "Seleziona i membri di tutte le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "Seleziona membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "Scarica tutti i membri delle relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "Scarica membri"
@@ -5840,9 +5898,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
 msgid "Zoom to selected element(s)"
-msgstr "Fai lo zoom sugli elementi selezionati"
+msgstr "Ingrandisci la visuale sugli elementi selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
 msgid "Zoom to selection"
-msgstr "Zoom sulla selezione"
+msgstr "Ingrandisci visuale sulla selezione"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:293
@@ -5918,4 +5976,6 @@
 "this system.</html>"
 msgstr ""
+"<html>Fallita la creazione di un indirizzo URL perché manca la codifica "
+"''''{0}''''<br>su questo sistema.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
@@ -5933,17 +5993,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
 msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Mostra le proprietà di base del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
 msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Mostra le etichette del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
 msgid "Content"
-msgstr ""
+msgstr "Contenuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
+"Mostra gli oggetti creati, aggiornati, ed eliminati dal gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
@@ -5955,47 +6016,50 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
 msgid "Query"
-msgstr ""
+msgstr "Interrogazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
 msgid "Launch the dialog for querying changesets"
-msgstr ""
+msgstr "Apri la finestra per l'interrogazione dei gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265
 msgid "Remove from cache"
-msgstr ""
+msgstr "Rimuovi dalla cache"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
 msgid "Remove the selected changesets from the local cache"
-msgstr ""
+msgstr "Rimuovi i gruppi di modifiche selezionati dalla cache locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
 msgid "Close the selected changesets"
-msgstr ""
+msgstr "Chiudi i gruppi di modifiche selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323
 msgid "Update changeset"
-msgstr ""
+msgstr "Aggiorna gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
 msgstr ""
+"Aggiorna dal server OSM i gruppi di modifiche selezionati con i dati correnti"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr ""
+msgstr "Scarica il contenuto del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
 msgid "Download the content of the selected changesets from the server"
-msgstr ""
+msgstr "Scarica dal server il contenuto dei gruppi di modifiche selezionati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
 msgid "My changesets"
-msgstr ""
+msgstr "Gruppi di modifiche personali"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
 msgstr ""
+"Scarica dal server OSM i propri gruppi di modifiche (max. 100 gruppi di "
+"modifiche)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
@@ -6005,19 +6069,22 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
+"<html>JOSM è in esecuzione con un utenza anonima. Non può scaricare<br>il "
+"tuo changesets dal server OSM fino a che non viene immesso lo username "
+"OSM<br> nelle preferenze di JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
 msgctxt "changeset.upload-comment"
 msgid "empty"
-msgstr ""
+msgstr "vuoto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
 msgctxt "changeset.open"
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
 msgctxt "changeset.open"
 msgid "Closed"
-msgstr ""
+msgstr "Chiuso"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
@@ -6025,13 +6092,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
 msgid "anonymous"
-msgstr ""
+msgstr "anonimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
 msgid "Comment"
-msgstr ""
+msgstr "Commento"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
 msgid "Open"
-msgstr ""
+msgstr "Apri"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
@@ -6042,9 +6109,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr ""
+msgstr "Creato il"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
 msgid "Closed at"
-msgstr ""
+msgstr "Chiuso il"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:68
@@ -6054,5 +6121,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:178
 msgid "Downloading changeset content"
-msgstr ""
+msgstr "Scaricamento del contenuto del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:70
@@ -6061,14 +6128,16 @@
 msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Era atteso un valore intero > 0 per il parametro ''''{0}'''', ottenuto "
+"''''{1}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:169
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Scaricamento del gruppo di modifiche {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:176
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Scaricamento del contenuto del gruppo di modifiche {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -6077,5 +6146,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
 msgid "Download content"
-msgstr ""
+msgstr "Scarica contenuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
@@ -6084,33 +6153,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Scarica dal server OSM il contenuto del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310
 msgid "Update content"
-msgstr ""
+msgstr "Aggiorna contenuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
 msgid "Update the changeset content from the OSM server"
-msgstr ""
+msgstr "Aggiorna dal server OSM il contenuto del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
 msgid "Show history"
-msgstr ""
+msgstr "Visualizza storico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr ""
+msgstr "Scarica e visualizza lo storico delle primitive selezionate"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
 msgid "Select in layer"
-msgstr ""
+msgstr "Seleziona nel livello"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
 msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Seleziona le primitive corrispondenti nel livello dei dati corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
@@ -6124,52 +6193,59 @@
 "''{0}''.</html>"
 msgstr[0] ""
+"<html>L''oggetto selezionato non è disponibile nel livello<br>delle "
+"modifiche corrente ''{0}''.</html>"
 msgstr[1] ""
+"<html>Nessuno degli oggetti selezionati è disponibile nel livello<br>delle "
+"modifiche corrente ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
 msgid "Nothing to select"
-msgstr ""
+msgstr "Niente da selezionare"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:425
 msgid "Zoom to in layer"
-msgstr ""
+msgstr "Ingrandisci visuale nel livello"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding primitives in the current data layer"
 msgstr ""
+"Ingrandisci la visuale sulle primitive corrispondenti nel livello dei dati "
+"corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Niente su cui ingrandire la visuale"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
 msgid "The content of this changeset is not downloaded yet."
 msgstr ""
+"Il contenuto di questo gruppo di modifiche non è stato ancora scaricato."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download now"
-msgstr ""
+msgstr "Scarica adesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
-msgstr ""
+msgstr "Scarica il contenuto del gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr ""
+msgstr "Creato"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
 msgid "Updated"
-msgstr ""
+msgstr "Aggiornato"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
 msgid "Deleted"
-msgstr ""
+msgstr "Eliminato"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -7065,43 +7141,44 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
 msgid "Comment:"
-msgstr ""
+msgstr "Commento:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr ""
+msgstr "Aperto/Chiuso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
 msgid "Created by:"
-msgstr ""
+msgstr "Creato da:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
 msgid "Created on:"
-msgstr ""
+msgstr "Creato il:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
 msgid "Closed on:"
-msgstr ""
+msgstr "Chiuso il:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
 msgctxt "changeset.state"
 msgid "Open"
-msgstr ""
+msgstr "Aperto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
 msgctxt "changeset.state"
 msgid "Closed"
-msgstr ""
+msgstr "Chiuso"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
 msgid "Remove the changeset in the detail view panel from the local cache"
 msgstr ""
+"Rimuovi il gruppo di modifiche nel pannello di dettaglio dalla cache locale"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
 msgid "Update the changeset from the OSM server"
-msgstr ""
+msgstr "Aggiorna dal server OSM il gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
@@ -7110,4 +7187,6 @@
 "layer"
 msgstr ""
+"Seleziona le primitive nel contenuto di questo gruppo di modifiche nel "
+"livello dei dati corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -7118,4 +7197,6 @@
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
+"<html>Nessuno degli oggetti presenti nel contenuto del gruppo di modifiche "
+"{0} è disponibile nel livello<br>delle modifiche corrente ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
@@ -7124,4 +7205,6 @@
 "layer"
 msgstr ""
+"Ingrandisci la visuale sulle primitive contenute in questo gruppo di "
+"modifiche nel livello dei dati corrente"
 
 #. parent for dialog is Main.parent
@@ -7129,26 +7212,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr ""
+msgstr "Scarica gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [incompleto]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "open"
-msgstr ""
+msgstr "aperto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "closed"
-msgstr ""
+msgstr "chiuso"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
 msgid "Changeset ID: "
-msgstr ""
+msgstr "ID gruppo di modifiche: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changset id"
-msgstr ""
+msgstr "Inserire un identificativo per il gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -7156,4 +7239,6 @@
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
+"Scarica il gruppo di modifiche con l'identificativo specificato, includendo "
+"anche il suo contenuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -7162,161 +7247,187 @@
 "> 0"
 msgstr ""
+"Il valore corrente non è un ID del gruppo di modifiche valido. Si prega di "
+"inserire un valore intero > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+msgstr "Inserire un valore intero > 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+msgstr "Seleziona i gruppi di modifiche che appartengono a utenti specifici"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+"Seleziona i gruppi di modifiche dipendentemente al fatto che siano aperti o "
+"chiusi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+"Seleziona i changeset sulla base della data/ora con i quali sono stati "
+"creati o chiusi."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+"Seleziona solamente i gruppi di modifiche relativi ad uno specifico riquadro "
+"di selezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+msgstr "Interroga solamente i gruppi di modifiche aperti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+msgstr "Interroga solo i changeset che sono stati chiusi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+msgstr "Interroga i gruppi di modifiche aperti e chiusi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+msgstr "ID utente; "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+msgstr "Nome utente: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+msgstr "Solo i miei changeset"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+msgstr "Solo i changesets dell'utente con il seguente ID utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+msgstr "Solo i changeset dell'utente con il seguente user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
 "is anonymous"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+"Non è possibile restringere l'interrogazione all'utente corrente perchè "
+"l'attuale utente è anonimo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+"Il valore corrente ''''{0}'''' non è valido per l'identificativo utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+msgstr "Non è possibile restringere l'interrogazione all' utente ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+msgstr "Si prega di inserire un identificativo utente valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+msgstr "Identificativo utente non valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+msgstr "Si prega di inserire un nome utente non vuoto"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+msgstr "Nome utente non valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+msgstr "Data: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+msgstr "Chiuso dopo il - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+msgstr "Creato prima del - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+msgstr "Solamente i gruppi di modifiche chiusi dopo la data/ora seguente"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+"Solamente i gruppi di modifiche chiusi dopo e creati prima di una specifica "
+"data/ora"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+"Impossibile costruire l'interrogazione sui gruppi di modifiche con le "
+"restrizioni temporali. L'inserimento non è valido."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
 "specific time range.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+"<html>Si prega di inserire dei valori data/ora validi per "
+"limitare<br>l'interrogazione ad uno specifico intervallo temporale.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+msgstr "Valori data/ora non validi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
 "invalid."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+"Impossibile limitare l''interrogazione sui gruppi di modifiche ad uno "
+"specifico riquadro di selezione. L''inserimento non è valido."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
 "changeset query to a specific bounding box.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+"<html>Inserire dei valori validi di longitudine/latitudine per "
+"limitare<br>l''interrogazione sui gruppi di modifiche ad uno specifico "
+"riquadro di selezione.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+msgstr "Riquadro di selezione non valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+"Il valore corrente non è un identificativo utente valido. Si prega di "
+"inserire un valore intero > 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+"<html>Il valore corrente non è un nome utente valido.<br>Si prega di "
+"inserire un nome utente non vuoto.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+msgstr "Si prega di inserire un nome utente non vuoto"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7324,6 +7435,8 @@
 "<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: {0}"
+"<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7334,5 +7447,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Scarica solamente i miei gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7350,95 +7463,101 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Di base"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
-msgstr ""
+msgid "Download changesets using predefined queries"
+msgstr ""
+"Scarica i gruppi di modifiche utilizzando delle interrogazioni predefinite"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "Dall'indirizzo URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
-msgstr ""
+msgid "Query changesets from a server URL"
+msgstr "Interroga i gruppi di modifiche da un indirizzo URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzate"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
-msgstr ""
+msgid "Use a custom changeset query"
+msgstr "Utilizza una interrogazione personalizzata sui gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Interroga gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Interroga e scarica gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
 msgstr ""
+"Si prega di inserire prima un indirizzo URL valido di una interrogazione sui "
+"gruppi di modifiche."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "Chiudi la finestra e annulla l'interrogazione sui gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr ""
+msgstr "Interrogazione e scaricamento dei gruppi di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Determinazione identificativo dell'utente corrente..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Interroga e scarica gruppi di modifiche ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+msgstr "Indirizzo URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr "Esempi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+msgstr "L'URL per l'interrogazione sui changesets non è valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+msgstr[0] "Questo modificherà {0} oggetto."
+msgstr[1] "Questo modificherà fino a {0} oggetti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+msgstr "Un campo vuoto cancellerà il tag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7447,10 +7566,10 @@
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7459,5 +7578,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7466,9 +7585,9 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Seleziona un valore"
@@ -7496,61 +7615,57 @@
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Elimina {0} relazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr "Selezionare la relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Nessuna relazione selezionata"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr "Selezionare la relazione nella selezione principale"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Seleziona le opzioni per il disegno delle linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Seleziona le opzioni per il disegno delle linee"
+msgstr "Selezionare la relazione nella lista delle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7610,5 +7725,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7621,15 +7736,15 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+msgstr[0] "Trasferimento di {0} figlio incompleto della relazione \"{1}\""
+msgstr[1] "Trasferimento di {0} figli incompleti della relazione \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+msgstr "Trasferimento delle relazioni"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Scaricamento del gruppo di modifiche {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -7933,5 +8048,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
 msgid "Zoom to"
-msgstr "Zoom a"
+msgstr "Ingrandisci la visuale"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
@@ -7939,13 +8054,18 @@
 msgid "Zoom to the object the first selected member refers to"
 msgstr ""
+"Ingrandisci la visuale sull'oggetto a cui si riferisce il primo membro "
+"selezionato"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
-"Ingrandimento disabilitato perché il livello di questa relazione non è attivo"
+"Ingrandimento della visuale disabilitato perché il livello di questa "
+"relazione non è attivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
 msgid "Zooming disabled because there is no selected member"
-msgstr "Ingrandimento disabilitato perché non c'è alcun membro selezionato"
+msgstr ""
+"Ingrandimento della visuale disabilitato perché non c'è alcun membro "
+"selezionato"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
@@ -8213,5 +8333,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Class Type"
-msgstr ""
+msgstr "Tipo della classe"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
@@ -8227,9 +8347,9 @@
 msgctxt "placeselection"
 msgid "Zoom"
-msgstr ""
+msgstr "Ingrandimento"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
 msgid "Choose the server for searching:"
-msgstr ""
+msgstr "Selezionare il servere per la ricerca:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
@@ -8301,6 +8421,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8344,5 +8465,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
 msgid "zoom level"
-msgstr "livello di zoom"
+msgstr "livello di ingrandimento"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
@@ -8550,10 +8671,10 @@
 #, java-format
 msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-msgstr ""
+msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
 #, java-format
 msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-msgstr ""
+msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
@@ -8585,13 +8706,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr ""
+msgstr "Ingrandisci la visuale sul nodo"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
 msgid "Zoom to this node in the current data layer"
-msgstr ""
+msgstr "Ingrandisci la visuale su questo nodo nel livello dei dati corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
 msgid "Open a history browser with the history of this node"
-msgstr ""
+msgstr "Apri un navigatore dello storico con lo storico di questo nodo"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
@@ -8608,5 +8729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
 msgid "not present"
-msgstr ""
+msgstr "non presente"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
@@ -8619,4 +8740,6 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
+"<html>Versione <strong>{0}</strong> attualmente editata nel layer ''{1}''</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
@@ -8654,14 +8777,14 @@
 #, java-format
 msgid "Version {0} in editor"
-msgstr ""
+msgstr "Versione {0} nell' editor"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
 msgid "[deleted]"
-msgstr ""
+msgstr "[cancellata]"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
 #, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr ""
+msgstr "Versione {0} attaualmente editata nel layer dei dati ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
@@ -8823,5 +8946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "Caricamento su un nuovo changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
@@ -8832,9 +8955,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "Caricamento su un changeset esistente"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Carica i dati su un gruppo di modifiche già esistente ed aperto"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
@@ -8863,5 +8986,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
-msgstr "Apri gruppi di modifiche"
+msgstr "Gruppi di modifiche aperti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
@@ -8891,12 +9014,14 @@
 "exception."
 msgstr ""
+"Attenzione: errore nel posizionare la Dialog delle Credenziali sempre in "
+"primo piano. Intercettata una eccezione di sicurezza"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
 msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "Immettere le credenziali per le API OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
 msgid "Enter credentials for HTTP proxy"
-msgstr ""
+msgstr "Immettere le credenziali per il proxy HHTP"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
@@ -8906,9 +9031,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
 msgid "Please enter the user name of your OSM account"
-msgstr ""
+msgstr "Immettere la password per il tuo account OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
 msgid "Please enter the password name of your OSM account"
-msgstr ""
+msgstr "Immettere la password per il tuo account OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
@@ -8918,4 +9043,6 @@
 "username and a valid password.</html>"
 msgstr ""
+"<html>Autenticazione fallita nelle OSM API ''{0}'' . Immettere un nome "
+"utente ed una password valida.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -9273,4 +9400,6 @@
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
+"Gestisci i gruppi di modifiche aperti e seleziona un gruppo di modifiche sul "
+"quale caricare"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
@@ -9343,4 +9472,6 @@
 "comment ''{1}''."
 msgstr ""
+"Gli oggetti sono stati caricati sul <strong>gruppo di modifiche aperto</"
+"strong> {0} con il commento ''''{1}''''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
@@ -9351,4 +9482,6 @@
 msgid "The changeset is <strong>left open</strong> after this upload"
 msgstr ""
+"Il gruppo di modifiche è stato lasciato <strong>aperto</strong> dopo questo "
+"caricamento"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
@@ -9437,6 +9570,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9532,9 +9665,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9545,5 +9677,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "Apri ed utilizza tanti nuovi gruppi di modifiche quanti necessari"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
@@ -9556,4 +9688,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -10008,24 +10147,24 @@
 msgstr[1] "{0} punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "File GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Il file {0} è stato caricato già sotto il nome \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Impossibile interpretare {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossibile leggere \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10036,34 +10175,34 @@
 "la foto.<br>Copia l'ora dalla foto e seleziona la fascia oraria<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Ora di scatto della fotografia (dai dati exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Ora GPS (letto dalla fotografia precedente): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [gg/mm/aaaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Mi trovo nel fuso orario di: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Nessuna data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Apri un'altra fotografia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Sincronizza l'ora da una fotografia del ricevitore GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -10073,114 +10212,116 @@
 "Si prega di usare il formato richiesto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Data non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Nessun tracciato GPX ancora caricato>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "Tracciato GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Apri un altro tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Auto-determina"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Fuso orario: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Scostamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Correla le immagini al tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Correla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Fuso orario non valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Compensazione non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuso orario: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10191,21 +10332,21 @@
 "manualmente le foto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "E' fallita la correlazione delle foto al tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Regola fuso orario e differenza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Le foto selezionate non contengono informazioni sull'ora."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Le foto non contengono informazioni sull'ora"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10214,17 +10355,17 @@
 "Selezionarne un altro."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "Il tracciato GPX non contiene alcuna informazione sull'ora"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Selezionare un tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Nessun tracciato GPX selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10235,5 +10376,5 @@
 "Formato atteso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10244,56 +10385,56 @@
 "Formato atteso: {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Estrazione delle localizzazioni GPS dagli EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Inizio analisi cartella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Uno dei file selezionati era nullo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Lettura delle foto ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lettura di {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Analisi cartella {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Trovato un file nullo nella cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Immagini geoetichettate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Correlazione ai dati GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10301,22 +10442,22 @@
 msgstr[1] "immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} sono stati trovati etichettati dal gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10381,5 +10522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
 msgid "Zoom best fit and 1:1"
-msgstr "Zoom ottimale e 1:1"
+msgstr "Ingrandimento ottimale e 1:1"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134
@@ -10508,4 +10649,590 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Usa le impostazioni globali."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autori"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Cliccare per annullare l'unione dei nodi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Canale"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nome utente: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Password"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Ruota a destra"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Aggiungi proprietà"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autori"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Inserire un nome utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Immettere la password per il tuo account OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Inizializzazione delle API fallita"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Permesso di accesso"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Preferenze avanzate"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Inserire l'espressione di ricerca"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Inserire un nome utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Inserire un nome utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Cliccare per annullare l'operazione corrente"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Selezionare almeno un nodo o percorso."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Nessuna corrispondenza trovata per ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Chiudi la finestra e annulla lo scaricamento"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Chiudi la finestra e crea un nuovo nodo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Prelevamento di un insieme di nodi da ''''{0}''''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Manca l''attributo obbligatorio ''''{0}''''."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, fuzzy, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Caricamento dei sorgenti dello stile da ''''{0}''''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Carica preferenze"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Riferimento torre"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Richiesta di aggiornamento"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Versione <strong>{0}</strong> attualmente editata nel layer ''{1}''</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Ristorante"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Cliccare per rimuovere la destinazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Colonnina SOS"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Cliccare per rimuovere la destinazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Permesso di accesso"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Aggiornamento fallito"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Il server OSM<br>''''{0}''''<br>ha riportato un errore interno al "
+"server.<br>Solitamente questo è un problema temporaneo. Riprovare più tardi."
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "stringa;stringa;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10539,5 +11266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10545,5 +11272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10551,7 +11278,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Scegli la riga da cancellare."
@@ -11033,12 +11760,4 @@
 msgstr "Dati OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Mantieni i file di backup"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Una volta salvato, mantieni i file di backup che finiscono con ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -11078,17 +11797,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Aspetto e stile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Predefinita (determinata automaticamente)"
@@ -11155,10 +11869,20 @@
 msgstr "Configura i siti delle estensioni"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Chiudi la finestra e crea un nuovo nodo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Annulla gli aggiornamenti e chiudi la finestra"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Impostazioni di visualizzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11168,30 +11892,30 @@
 "programma."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Impostazioni di connessione al server OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Impostazioni della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 "Impostazioni per la proiezione della mappa e l'interpretazione dei dati."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Impostazione dell'audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Impostazioni del riproduttore audio e del marcatore audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -11220,93 +11944,29 @@
 "La proiezione {0} non può essere attivata. Si utilizzerà quella di Mercatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Attrazione turistica"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Impostazioni Proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "L'URL di base per il server OSM (API REST)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Nome di accesso (e-mail) al profilo OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
-"password."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL di base per il server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "Nome utente OSM (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Password OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>ATTENZIONE: La password viene memorizzata in chiaro nel file di "
-"configurazione.<br>La password è trasmessa in chiaro al server, codificata "
-"all'interno dell'indirizzo URL.<br><b>Non usare una password importante.</"
-"b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11615,4 +12275,258 @@
 msgstr "Gruppi dei modificatori"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Indirizzo URL non valido?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Fallita l''apertura della connessione al server remoto<br>''''{0}''''."
+"<br>Controllare la propria connessione ad internet.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Connessione non riuscita."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Usa l'impostazione predefinita"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Mantieni i file di backup"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Una volta salvato, mantieni i file di backup che finiscono con ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Username OSM (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Password OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>ATTENZIONE: La password viene memorizzata in chiaro nel file di "
+"configurazione.<br>La password è trasmessa in chiaro al server, codificata "
+"all'interno dell'indirizzo URL.<br><b>Non usare una password importante.</"
+"b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Preferenze"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL di base per il server"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Convalida"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+#, fuzzy
+msgid "The API URL is valid."
+msgstr "L'URL per l'interrogazione sui changesets non è valido"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Il valore corrente è quello di default."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Riavviare JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11730,4 +12644,6 @@
 "a bounding box)"
 msgstr ""
+"Indirizzo URL da www.openstreetmap.org (qui puoi incollare un indirizzo URL "
+"di scarico per specificare un riquadro di selezione)"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -11756,5 +12672,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11806,23 +12722,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11831,16 +12753,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11848,5 +12770,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11854,5 +12776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -12094,5 +13016,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -12140,5 +13062,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -12187,15 +13109,14 @@
 msgstr "OK - nuovo tentativo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Inizio del ripristino {0} di {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-"L'insieme di modifiche corrente è nullo. Non si possono caricare i dati."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
@@ -12204,5 +13125,5 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -12211,11 +13132,11 @@
 "chiuso con id {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Code={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12390,4 +13311,21 @@
 msgstr "Analisi della lista degli insiemi di modifiche..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Era atteso un valore non vuoto per il parametro ''''{0}'''', ottenuto "
+"''''{1}''''"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12716,20 +13654,20 @@
 "internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "Etichetta XML <user> mancante."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Manca l''attributo ''''{0}'''' sulla etichetta XML ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
@@ -12737,4 +13675,9 @@
 "Valore non valido per l''attributo ''''{0}'''' sulla etichetta XML "
 "''''{1}''''. Ottenuto {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Lettura dell''insieme di modifiche {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -13133,5 +14076,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -13143,5 +14086,5 @@
 "propria connessione ad internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -13154,5 +14097,5 @@
 "{1}, rimuovere il riferimento alla relazione {0}, e riprovare.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -13164,5 +14107,34 @@
 "usato<br>viola una precondizione.<br>Il messaggio di errore é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html>Autenticazione fallita nelle OSM API ''{0}'' . Immettere un nome "
+"utente ed una password valida.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>Autenticazione fallita nelle OSM API ''{0}'' . Immettere un nome "
+"utente ed una password valida.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -13173,5 +14145,5 @@
 "strong><br>perché è stato già chiuso.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -13182,5 +14154,5 @@
 "strong><br>perché è stato già chiuso il {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -13191,9 +14163,9 @@
 "errore (non tradotto):<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Il server riporta che è stato trovato un conflitto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -13202,5 +14174,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -13214,5 +14186,5 @@
 "caricata da ''''{1}''''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -13223,5 +14195,5 @@
 "<br>Controllare la propria connessione ad internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -13233,5 +14205,5 @@
 "<br>Dettagli (non tradotti): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -13243,10 +14215,10 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -13259,10 +14231,10 @@
 "OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Messaggio di errore (non tradotto): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -13278,5 +14250,5 @@
 "''''{0}'''' per identificare eventuali errori di battitura."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13290,5 +14262,5 @@
 "ad internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13304,18 +14276,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13351,4 +14310,10 @@
 "Attenzione: fallita la derivazione del prefisso della lingua di riferimento "
 "dal codice JOSM ''{0}''. Utilizzo del codice predefinito ''en''."
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -13766,5 +14731,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Seleziona Feuille"
@@ -13815,5 +14780,11 @@
 msgstr "CadastreGrabber: indirizzo url non valido."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13824,25 +14795,23 @@
 "oppure azione annullata"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Scegliere da..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Seleziona il comune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Scegliere da..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Sorgente auto-determinata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13855,13 +14824,13 @@
 "Si desidera ripristinare F11 per l'azione di cattura ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Ripristino della scorciatoia F11 di cattura"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13871,34 +14840,34 @@
 "del pannello delle opzioni. L''eccezione è stata: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Sostituisci lo sfondo originale con il colore di sfondo JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Inverti i colori grigi (per sfondi neri)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Imposta lo sfondo trasparente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Traccia i contorni dei dati scaricati."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr "Disabilita il ritaglio dell'immagine durante la georeferenziazione."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Abilita la cache automatica."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Massima dimensione della cache (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13916,9 +14885,9 @@
 "caricamento di dati creati da questa estensione."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS francese del catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13926,10 +14895,10 @@
 "automatica</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Sorgente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13939,5 +14908,5 @@
 "preferenze di JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13947,9 +14916,9 @@
 "intermedi). Utile per testi su sfondi scuri."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Permette la sovrapposizione di livelli multipli"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13957,37 +14926,37 @@
 "trasparente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Traccia un rettangolo attorno i dati scaricati dal server WMS."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr "Moltiplicatore di cattura per immagini vettoriali:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Ottieni immagini più piccole (maggiore qualità ma più utilizzo di memoria)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Dimensioni fisse riquadro (predefinito è 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Dimensioni fisse (da 25 a 1000 metri)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr "Moltiplicatore di cattura per immagini raster:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr "Mostra trasversali:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -14109,5 +15078,5 @@
 "Si desidera utilizzarli?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -14117,14 +15086,14 @@
 "(richiesti due punti)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "Ritaglio immagine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr "Cliccare il secondo angolo per il ritaglio dell''immagine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -14134,14 +15103,14 @@
 "(richiesti due punti)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr "Georeferenziazione immagine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Cliccare la seconda traversa di Lambert per la georeferenziazione"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -14151,21 +15120,21 @@
 "o riprovare "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "Inserire la posizione est,nord del catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(Attenzione: controllare la direzione nord mediante la freccia !!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Est"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Nord"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -14280,28 +15249,28 @@
 msgstr "Livello vuoto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Layer WMS ({0}), {1} tasselli caricati"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Non è vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Dimensioni raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "E' stato vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Riquadro del comune: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -14312,9 +15281,9 @@
 "Crearne uno nuovo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Errore nel formato della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -14323,38 +15292,38 @@
 "Lambert {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Errore nella zona di Lambert della cache"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Uso"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Selezionare uno schema da usare."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Schema di colori"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Selezionare lo schema da eliminare."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Usa lo schema selezionato nella lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Usa i colori attuali come nuovo schema di colori."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Elimina lo schema selezionato nella lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Schemi di colore"
@@ -14519,6 +15488,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Aggiorna"
@@ -14748,33 +15717,33 @@
 msgstr "E' stato generato un errore sconosciuto"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "nordest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "nordovest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "ovest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "sudovest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "sud"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "sudest"
@@ -14814,5 +15783,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14823,76 +15792,76 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "acqua"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "linea di costa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "terraferma"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Numero massimo di segmenti per percorso"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Numero massimo di nodi nel tracciato iniziale"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valore massimo del colore grigio da considerare come acqua (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Accuratezza della semplificazione della linea (gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Risoluzione dei tasselli Landsat (pixel per gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Dimensione dei tasselli Landsat (pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Sposta tutti i tracciati verso est (gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Sposta tutti i tracciati verso nord (gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Direzione di ricerca della terraferma"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Etichetta i percorsi come"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Livello WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Dimensione massima della cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Età massima della cache (giorni)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Testo sorgente"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -14900,5 +15869,5 @@
 "250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14908,5 +15877,5 @@
 "Predefinito 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14916,5 +15885,5 @@
 "dati Landsat IR-1). Può essere nell'intervallo 0-255. Predefinito 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14925,5 +15894,5 @@
 "Predefinito 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14932,22 +15901,22 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 "Dimensione di un tassello Landsat, misurata in pixel. Predefinito 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Sposta tutti i punti verso la direzione Est (gradi). Predefinito 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Sposta tutti i punti verso la direzione Nord (gradi). Predefinito 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Direzione di ricerca della terraferma. Predefinita è Est."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14955,26 +15924,26 @@
 "queste. Predefinito è acqua."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Quale livello WMS usare per il tracciamento. IR1 è il predefinito."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Dimensione massima in byte per ogni cartella di cache. Predefinita è 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Età massima in giorni per ogni file nella cache. Predefinita è 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Sorgente dei dati. Predefinita è Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Una estensione per tracciare le superfici acquee su immagini Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Preferenze dell'estensione Lakewalker"
@@ -15192,5 +16161,5 @@
 msgstr "Ciclo di scaricamento di OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Visualizza segnalazioni OpenStreetBugs"
@@ -15221,5 +16190,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -15236,14 +16204,22 @@
 "singola stringa"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Apri OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Apre la finestra OpenStreetBugs e attiva lo scaricamento automatico"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -15253,22 +16229,32 @@
 "da OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+#, fuzzy
+msgid "Queue"
+msgstr "Interrogazione"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Aggiungi un commento"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Inserire il proprio commento"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Commento:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Imposta come completata"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Si vuole veramente chiudere la segnalazione?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -15278,23 +16264,51 @@
 "aggiungere un commento opzionale:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Chiudi"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nuova segnalazione"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Crea segnalazione"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Descrivere il problema in modo preciso"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Creato"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Inserire un nome utente"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Stato della segnalazione sconosciuto"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Apri OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15316,10 +16330,10 @@
 msgstr "Estensione del file sconosciuta: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -15329,5 +16343,5 @@
 "delle impostazioni della mappa nelle preferenze."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Eseguibile di Firefox"
@@ -15337,25 +16351,25 @@
 msgstr "PicLayer"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "carica dati dalle API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "crea nuovi oggetti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "cambia la selezione"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "cambia la visualizzazione"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "conferma manualmente tutte le azioni di controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
@@ -15363,13 +16377,13 @@
 "applicazioni."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Preferenze per l'estensione di controllo remoto."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15381,5 +16395,5 @@
 "applicazioni esterne che devono dialogare con l'estensione."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Azioni permesse"
@@ -15496,25 +16510,25 @@
 msgstr "Cancella l'itinerario"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Preferenze del Plugin per il Routing"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Imposta le preferenze di Routing"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Tipo strada"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Velocità (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Peso"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Inserire i valori di peso"
@@ -15560,42 +16574,42 @@
 msgstr "immagine "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
-msgstr "autozoom"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+msgstr "ingrandimento automatico"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "carica automaticamente i tasselli"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Impostazioni per l'estensione SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Sorgenti dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
-msgstr "Auto zoom: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+msgstr "Ingrandimento automatico: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Carica utomaticamente i tasselli: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr "Livello di ingrandimento minimo: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
-msgstr "Massimo livello di zoom: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+msgstr "Livello di ingrandimento massimo: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Smorza lo sfondo: "
@@ -15834,26 +16848,26 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Usa elenco degli avvertimenti da ignorare."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Usa l'elenco degli avvertimenti da ignorare per non visualizzarli."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Usa livello degli errori."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 "Usa il livello degli errori per visualizzare gli elementi con problemi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Visualizza il livello informativo durante il caricamento."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
@@ -15861,13 +16875,13 @@
 "caricamento."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "A richiesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Al caricamento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15877,5 +16891,5 @@
 "programmi di modifica."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Verifica dati"
@@ -15945,5 +16959,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:88
 msgid "Zoom to problem"
-msgstr "Porta lo zoom sul problema"
+msgstr "Ingrandisci la visuale sul problema"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
@@ -16507,5 +17521,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "building"
@@ -16519,5 +17533,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "area"
@@ -16702,5 +17716,5 @@
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:194
 msgid "Merge duplicate node?"
-msgstr ""
+msgstr "Fondere il nodo duplicato?"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:211
@@ -16719,5 +17733,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
 msgid "Not in cache"
-msgstr ""
+msgstr "Non in cache"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -16879,6 +17893,6 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
-"L'area richiesta è troppo grande. Per favore scegli uno zoom più piccolo, "
-"oppure cambia risoluzione"
+"L'area richiesta è troppo grande. Si prega di ingrandire un poco la visuale, "
+"oppure di cambiare la risoluzione"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
@@ -16929,5 +17943,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
 msgid "Set WMS Bookmark"
-msgstr ""
+msgstr "Imposta segnalibro WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
@@ -16939,55 +17953,55 @@
 msgstr "Apri un livello WMS vuoto per caricare i dati da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Preferenze dell'estensione WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modifica la lista dei server WMS mostrata nel menù dell'estensione WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Nome del Menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Nome del menu (predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "URL WMS (Predefinito)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Inserire un nome per il menù e un URL WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Copia il predefinito selezionato"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Selezionare almeno una riga da copiare."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Downloader:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Sovrapponi i tasselli"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "% est:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "% nord:"
@@ -18584,6 +19598,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada/tangenziale"
@@ -18609,6 +19623,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
@@ -18634,6 +19648,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "primaria"
@@ -18659,6 +19673,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "secondaria"
@@ -18672,5 +19686,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "terziaria"
@@ -18688,5 +19702,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "residenziale"
@@ -18720,6 +19734,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "strada di servizio"
@@ -18753,6 +19767,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "construction"
@@ -18802,5 +19816,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rotatoria"
@@ -19786,5 +20800,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "palude alluvionale"
@@ -20764,5 +21778,5 @@
 #: build/trans_presets.java:1534
 msgid "Tactile Paving"
-msgstr ""
+msgstr "Pavimentazione tattile"
 
 #. </optional>
@@ -21183,7 +22197,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "strada"
@@ -21911,28 +22925,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -23627,4 +24641,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23659,9 +24681,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "verde"
@@ -23767,5 +24789,5 @@
 #: build/trans_presets.java:2499
 msgid "Car Dealer"
-msgstr ""
+msgstr "Concessionaria"
 
 #. item "Shops/Car Dealer"
@@ -23773,10 +24795,10 @@
 #: build/trans_presets.java:2501
 msgid "Edit Car Shop"
-msgstr "Concessionaria"
+msgstr "Modifica concessionaria"
 
 #. item "Shops/Car Dealer" text "Operator"
 #: build/trans_presets.java:2506
 msgid "Bike Dealer"
-msgstr ""
+msgstr "Negozio di biciclette"
 
 #. item "Shops/Bike Dealer"
@@ -25070,7 +26092,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "bicicletta"
@@ -25140,7 +26162,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "pedone"
@@ -25166,5 +26188,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metropolitana"
@@ -25460,5 +26482,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "deprecato"
@@ -25500,5 +26522,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "cavallo"
@@ -25608,4 +26630,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25643,5 +26671,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25714,11 +26742,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "barriera"
@@ -25781,5 +26809,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "superstrada"
@@ -25835,7 +26863,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "tracciato stradale"
@@ -25906,9 +26934,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "ferrovia"
@@ -26000,5 +27028,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "stazione di servizio"
@@ -26012,5 +27040,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "guado"
@@ -26031,10 +27059,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26044,5 +27072,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "punto di accesso di emergenza"
@@ -26057,5 +27085,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "sponda"
@@ -26069,5 +27097,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "torrente"
@@ -26081,5 +27109,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "darsena"
@@ -26268,13 +27296,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "costruzioni umane"
@@ -26336,7 +27364,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -26359,10 +27387,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "altro_ferrovia"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -26398,7 +27426,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "vecchia_ferrovia"
@@ -26444,6 +27472,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "aeroporto"
@@ -26457,5 +27485,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -26477,5 +27505,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
@@ -26489,5 +27517,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
@@ -26549,7 +27577,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "struttura_di_risalita"
@@ -26566,5 +27594,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "pista_facile"
@@ -26579,5 +27607,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "pista_intermedia"
@@ -26592,5 +27620,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "pista_avanzata"
@@ -26605,5 +27633,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "pista esperto"
@@ -26618,5 +27646,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "pista libera"
@@ -26631,5 +27659,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "pista_principiante"
@@ -26749,11 +27777,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "elettricità"
@@ -26767,5 +27795,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "pontile"
@@ -26779,5 +27807,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "conduttura"
@@ -26921,13 +27949,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -26941,5 +27969,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "porto turistico"
@@ -27035,10 +28063,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -27140,14 +28168,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27543,5 +28578,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27566,23 +28601,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -27614,6 +28649,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -27674,8 +28709,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "salute"
@@ -28028,26 +29063,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "negozio"
@@ -28119,8 +29154,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -28191,5 +29226,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28198,5 +29233,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -28206,5 +29241,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28213,5 +29248,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28221,9 +29256,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turismo"
@@ -28311,14 +29346,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "attrazione storica"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28327,5 +29361,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "cava/miniera"
@@ -28339,5 +29373,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "discarica"
@@ -28359,5 +29393,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "bacino"
@@ -28371,5 +29405,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "foresta"
@@ -28383,5 +29417,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "aia"
@@ -28404,5 +29438,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -28416,5 +29450,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industriale"
@@ -28428,5 +29462,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "ridestinazione d'uso"
@@ -28440,5 +29474,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -28452,5 +29486,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "area ferroviaria"
@@ -28507,7 +29541,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "militare"
@@ -28521,5 +29555,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "cimitero"
@@ -28532,5 +29566,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "picco montuoso"
@@ -28545,5 +29579,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -28557,5 +29591,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulcano"
@@ -28610,8 +29644,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "elemento naturale"
@@ -28625,5 +29659,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "boscaglia"
@@ -28637,5 +29671,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "brughiera"
@@ -28649,5 +29683,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "area boschiva non gestita"
@@ -28661,5 +29695,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -28673,5 +29707,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "spiaggia"
@@ -28749,8 +29783,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "percorso"
@@ -28773,4 +29807,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28798,7 +29873,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "confine"
@@ -28948,11 +30028,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "luogo"
@@ -29000,6 +30080,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "indirizzo"
@@ -29355,4 +30435,19 @@
 msgstr "Sicilia - Italia"
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "L'URL di base per il server OSM (API REST)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Nome di accesso (e-mail) al profilo OSM."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
+#~ "password."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "Nome utente OSM (e-mail)"
+
 #~ msgid "No data imported."
 #~ msgstr "Nessun dato importato."
@@ -29538,7 +30633,4 @@
 #~ msgstr "Nome utente (email) per l'account di OSM."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "Username OSM (email)"
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Nome utente o password errati."
@@ -29729,10 +30821,4 @@
 #~ msgid "error loading metadata"
 #~ msgstr "errore nel caricamento dei metadati"
-
-#~ msgid "Request Update"
-#~ msgstr "Richiesta di aggiornamento"
-
-#~ msgid "Validate"
-#~ msgstr "Convalida"
 
 #~ msgid "rectifier id={0}"
@@ -30353,7 +31439,4 @@
 #~ msgstr "Aggiorna la selezione"
 
-#~ msgid "Update failed"
-#~ msgstr "Aggiornamento fallito"
-
 #~ msgid "Selection too big"
 #~ msgstr "Selezione troppo grande"
@@ -30376,7 +31459,4 @@
 #~ msgid "Error when communicating with server."
 #~ msgstr "Errore durante la comunicazione con il server."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Inizializzazione delle API fallita"
 
 #~ msgid "Missing primitive"
@@ -30749,4 +31829,8 @@
 #~ "caricamento differenziale."
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr ""
+#~ "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati."
+
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
@@ -30791,4 +31875,7 @@
 #~ "Caricare le proprie modifiche, chiudere tutti i livelli e cambiare\n"
 #~ "manualmente la zona di Lambert dal menu Cadastre"
+
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 19246)
+++ applications/editors/josm/i18n/po/ja.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-30 08:06+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-05 03:37+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -300,4 +300,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "続ける"
@@ -328,5 +329,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -342,7 +343,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -478,6 +482,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -556,5 +561,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -568,5 +573,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "情報"
@@ -764,15 +769,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "削除"
@@ -851,6 +856,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1504,14 +1509,15 @@
 msgstr[0] "{0} プリミテブまで"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "設定..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "全体の設定のページを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "設定"
@@ -1656,17 +1662,17 @@
 msgstr "ヘルプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "状況報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "クリップボードにコピーして閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1803,33 +1809,33 @@
 msgstr "このノードは、他のどれとも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "どのノードも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "どのウェイも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "現在の選択は引き離せません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "ほかを選択："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* 1つのタグのついたノード、または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* 1つ以上のウェイに使われている1つのノード, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1837,5 +1843,5 @@
 "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1843,5 +1849,5 @@
 "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1856,9 +1862,9 @@
 "コピーが作られ、全てのノードが選択状態になります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "ノードを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1866,5 +1872,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2032,4 +2038,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "戻る"
@@ -2725,5 +2733,5 @@
 #, java-format
 msgid "Incorrect value of version operator: {0}. Number is expected."
-msgstr ""
+msgstr "バージョン演算子の不正な値: {0}。数値が期待されています。"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
@@ -3175,10 +3183,10 @@
 #, java-format
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "不正な緯度の値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
 #, java-format
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "不正な経度の値 ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:111
@@ -3288,24 +3296,24 @@
 "エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "設定は{0}に保存"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "設定をアップロードできませんでした。理由: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "サーバから設定をロードできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr "エラー: サーバからのブックマークリストに予期せぬ行 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3315,5 +3323,5 @@
 "エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3326,6 +3334,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "リソース''{0}'' のロードに失敗、エラーコード: {1}。"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3745,6 +3753,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3910,5 +3918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3923,10 +3931,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "道路"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3934,15 +3942,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "水路"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "土地利用"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3954,6 +3962,11 @@
 msgstr[0] "{0}ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "公共交通機関"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3961,5 +3974,5 @@
 msgstr[0] "{0} メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4001,9 +4014,19 @@
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "認証"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "接続失敗"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "オブジェクトは削除されました"
@@ -4109,65 +4132,65 @@
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "bounding boxをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "言語の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4179,9 +4202,9 @@
 "     Javaの使用メモリ最大サイズを増やすオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4191,25 +4214,25 @@
 "読み込まれることにご注意ください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "アップデートしたプラグインの活性化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4222,5 +4245,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4229,5 +4252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4337,5 +4360,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "ユーザ:"
@@ -5021,5 +5044,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5034,5 +5057,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5040,5 +5063,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5129,5 +5152,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "なし"
@@ -5311,5 +5334,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5321,5 +5344,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5414,5 +5437,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5421,5 +5444,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5500,13 +5523,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "追加"
@@ -5639,54 +5662,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "新規リレーション作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "現在の選択を選択したリレーションのリストへセットする"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "全ての選択済リレーションのメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "メンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "選択済リレーションの全メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "メンバーをダウンロード"
@@ -7023,58 +7046,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7082,58 +7105,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7141,9 +7164,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7151,5 +7174,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7157,15 +7180,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7173,9 +7196,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7184,5 +7207,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7209,9 +7232,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "基本"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7221,5 +7245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7230,5 +7254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7270,22 +7294,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7293,10 +7319,10 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr "空の値でタグを削除します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7305,10 +7331,10 @@
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7316,5 +7342,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7322,9 +7348,9 @@
 msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "値を選択してください"
@@ -7352,61 +7378,57 @@
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "{0} のリレーションを削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "リレーションが選択されていません"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "線描画オプションの選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "線描画オプションの選択"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7463,5 +7485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7475,11 +7497,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr "リレーションをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}: リレーションをダウンロード中 ''{2}''..."
 
@@ -8119,6 +8141,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9206,6 +9229,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9299,9 +9322,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9323,4 +9345,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9750,24 +9779,24 @@
 msgstr[0] "{0} ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPXファイル(*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "{0}の解析中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "\"{0}\"を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9779,34 +9808,34 @@
 "を読み取って、タイムゾーンを選択します。<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "写真の時刻(exifから取得):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "(写真から読み取った)GPSの時刻: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "タイムゾーンの選択: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "日付なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "他の写真を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "GPSレシーバーの写真から時刻を同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9816,114 +9845,116 @@
 "入力する形式を確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "不正な日付"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<GPXトラックがまだ読み込まれていません>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPXトラック: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "ほかのGPXトレースを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "自動推測"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "タイムゾーン: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "オフセット:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "GPXトラックに画像を関連づけます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "関連付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "不正なタイムゾーン"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "不正なオフセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "タイムゾーン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9933,21 +9964,21 @@
 "合できます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "選択した写真には時間情報がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "写真は時間情報を含んでいません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -9956,17 +9987,17 @@
 "してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPXトラックは、時間情報を持っていません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "GPXトラックを選択しなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "GPXトラックの選択がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9977,5 +10008,5 @@
 "期待する形式: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9986,78 +10017,78 @@
 "期待されるフォーマット: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIFからGPS位置を取得"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "ディレクトリ走査の開始"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "選択されたファイルのひとつがヌルでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "写真を取り込む"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "{0}を読み込んでいます ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "ディレクトリ {0} を走査"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
 msgstr[0] "画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} は gps タグがつけられていることがわかりました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10248,4 +10279,589 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "全体設定を使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "クリックしてノードのマージを中断"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "運河"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "ユーザ名"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "パスワード"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "右へ回転"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "プロパティの追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "あなたのユーザ名を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "あなたのOSMアカウントのユーザ名を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "アクセス"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "高度な設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "検索表現を入力"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "あなたのユーザ名を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "あなたのユーザ名を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "クリックして現在の操作をキャンセル"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "少なくとも1つはノードかウェイを選んでください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "\"{0}\"にマッチするものが見つからない"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "ダイアログを閉じてダウンロードをキャンセル"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "ダイアログを閉じて新しいノードを作成"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "''{0}'' からノードのパッケージを取得中"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+#, fuzzy
+msgid "Initializing a session at the OSM website..."
+msgstr "更新するリレーションを初期化中 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "必要な属性 ''{0}'' がありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "アップロード設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "塔の参照番号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "要求の更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "レストラン"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "クリックして行き先を削除。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "夜間急病センター"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "クリックして行き先を削除。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "アクセス"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "接続に失敗しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>OSM サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>"
+"おそらく一時的な問題です。後ほどやり直してみてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "文字列：文字列：…"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10278,5 +10894,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10284,5 +10900,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10290,7 +10906,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "削除する列を選択してください。"
@@ -10743,13 +11359,4 @@
 msgstr "OSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "バックアップファイルの保存"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10788,17 +11395,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "ルック＆フィール"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "言語"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr "利用可能な翻訳を探しています ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "既定（自動判定）"
@@ -10865,10 +11467,20 @@
 msgstr "プラグインサイトを設定"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "ダイアログを閉じて新しいノードを作成"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "更新をキャンセルしてダイアログを閉じる"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "表示設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10876,29 +11488,29 @@
 msgstr "プログラム全体の見た目に影響する各種設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "OSMサーバへの接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "マップ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "地図投影法とデータ解釈の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "オーディオ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "オーディオプレイヤーと音声マークの設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
@@ -10925,90 +11537,29 @@
 msgstr "投影法 {0} は、有効化できませんでした。メルカトル図法を使います。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "認証"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "プロキシー設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "OSMサーバのベースURL（REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "OSM アカウントへのログイン名(e-mail)。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "サーバのベースURL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM ユーザ名 (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSMパスワード"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>警告: パスワードは設定ファイルに平文で保管されています。<br>パスワード"
-"はサーバに平文で、URLエンコードされて送信されます。<br><b>重要なパスワードは"
-"使用しないでください。</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11306,4 +11857,259 @@
 msgstr "修飾グループ"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "不正なURL？"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>リモートサーバ ''{0}' への接続が開けません。<br>インターネット接続を"
+"チェックしてください。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "接続に失敗しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+#, fuzzy
+msgid "Use Basic Authentication"
+msgstr "認証をキャンセル"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+#, fuzzy
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr "入力されたユーザ名とパスワードで認証"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "既定の使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "バックアップファイルの保存"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSMユーザ名（email）"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSMパスワード"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>警告: パスワードは設定ファイルに平文で保管されています。<br>パスワード"
+"はサーバに平文で、URLエンコードされて送信されます。<br><b>重要なパスワードは"
+"使用しないでください。</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "サーバのベースURL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "検証"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "現在の値は既定値です。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "JOSMを再起動してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11445,5 +12251,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11495,23 +12301,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11520,16 +12332,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11537,5 +12349,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11543,5 +12355,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11781,5 +12593,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11825,5 +12637,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11871,19 +12683,19 @@
 msgstr "OK - やり直しています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "{1} 分の {0} 回の再試行を開始。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "現在の変更セットはヌルです。データをアップロードできません。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -11892,11 +12704,11 @@
 "た。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(コード={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12057,4 +12869,19 @@
 msgstr "変更セットのリストを解析中..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12364,23 +13191,28 @@
 msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "XML タグ <user> がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "XML タグ ''{1}'' の属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "変更セット {0} を読み込んでいます ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12769,5 +13601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12778,5 +13610,5 @@
 "ンターネット接続をチェックしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12789,5 +13621,5 @@
 "ン {0} への参照を削除し、再度アップロードしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12799,5 +13631,30 @@
 "タセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12808,5 +13665,5 @@
 "れています。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12817,5 +13674,5 @@
 "閉じられています。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12824,9 +13681,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>サーバから競合検出の連絡がありました。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12835,5 +13692,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12846,5 +13703,5 @@
 "ドしていないためだと思われます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12855,5 +13712,5 @@
 "チェックしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12865,5 +13722,5 @@
 "失敗しました。<br>詳細(原文): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12874,10 +13731,10 @@
 "おそらく一時的な問題です。後ほどやり直してみてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12889,10 +13746,10 @@
 "ポートファイルを使用してください。"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>エラーメッセージ(未訳): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12903,5 +13760,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12914,5 +13771,5 @@
 "てください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12927,18 +13784,5 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12969,4 +13813,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13369,5 +14219,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "用紙選択"
@@ -13418,5 +14268,11 @@
 msgstr "CadastreGrabber: 不正な url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13427,25 +14283,23 @@
 "又はキャンセルされました。"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "選択..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "コミューンの選択"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "選択..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "自動ソーシング"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13457,13 +14311,13 @@
 "F11 を取得アクションに戻しますか？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "F11 を取得ショートカットに戻す"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "変更が実施されるようにJOSM を停止しました"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13473,34 +14327,34 @@
 "コード: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "JOSM背景色で、オリジナルの背景を置き換える。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "グレーカラーの反転 (黒い背景用)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "背景を透明に設定。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "ダウンロードデータの境界を描画"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr "地理参照中にイメージ切り抜きを無効化"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "自動キャッシュを有効にする"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "最大キャッシュサイズをMB単位で指定します。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13517,18 +14371,18 @@
 "CU_01_ConditionsGenerales_fr.html</a>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "French cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>可能な場合、キー  \"source\" の値を自動化</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "情報ソース"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13536,5 +14390,5 @@
 msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13543,44 +14397,44 @@
 "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "複数レイヤーの重ね合わせを許可します。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr "WMSレイヤーを透明にします。右が不透明、左が透明です。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "WMSサーバからダウンロードしたデータの周囲に長方形を描画します。"
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr "ベクタイメージ取得倍率:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "より小さい画像を取得してください。(より高品質だがよりメモリを使う)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "固定サイズ正方形（初期値は100メートル）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "固定サイズ（25～1000メートル）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr "ラスタイメージ取得倍率:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "このサイズを超えると古いファイルは自動的に削除されます"
@@ -13699,5 +14553,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13707,14 +14561,14 @@
 "(二箇所必要)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "イメージ切り抜き"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr "切り抜くイメージの二番目の角をクリック"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13724,14 +14578,14 @@
 "（２つのポイントが必要）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr "地理参照画像"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "２番目の地理参照用ランベルトcrosspiece をクリック"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13741,21 +14595,21 @@
 "それとも単にやり直しますか "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "cadastre の東、北の位置を入力"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(警告: 矢印のある北を確認！)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "東経"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "北緯"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13870,28 +14724,28 @@
 msgstr "ブランクのレイヤー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMSレイヤー ({0}), {1}このタイル読み込み"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "ベクターではありません。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "ラスターサイズ: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "ベクタライズされました。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "都道府県 bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13902,9 +14756,9 @@
 "であるべきです"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "キャッシュフォーマットエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -13912,38 +14766,38 @@
 "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "ランベルトゾーンキャッシュエラー"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "使う"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "使用するスキームを選択してください。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "配色"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "削除する配色を選択してください。"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "選択した配色を一覧から使用する。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "現在の色を、新しい配色として使用します。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "選択した配色を一覧から削除する。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "配色"
@@ -14107,6 +14961,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "リフレッシュ"
@@ -14337,33 +15191,33 @@
 msgstr "不明なエラーが発生"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "東"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "北東"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "北西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "南西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "南"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "南東"
@@ -14403,5 +15257,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14412,80 +15266,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "水域(湖沼)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "海岸線"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "陸地"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "ウェイあたりの最大セグメント数"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "初期トレースの最大ノード数"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "水域として判断したグレーの最大閾値(0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "線を簡略化するぶれ幅(度)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "ランドサットタイルの解像度(度あたりのピクセル)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "ランドサットタイルのサイズ (ピクセル)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "全てのトレースを東にシフト(度）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "全てのトレースを北にシフト(度)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "陸地の検索方向"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "ウェイにタグ付け"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMSレイヤー"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "最大キャッシュサイズ(MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "最大キャッシュ期間(日)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "ソーステキスト"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "各生成されたウェイで許されるセグメントの最大数。既定値は250"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14495,5 +15349,5 @@
 "数。デフォルト値は50000。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14503,5 +15357,5 @@
 "である．デフォルトは90。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14511,50 +15365,50 @@
 "正確なラインが増えます。 既定値 0.0003。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "ピクセル/度 単位のランドサットタイルの解像度。デフォルトは 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "ランドサットの一タイルのサイズをピクセル単位で。既定値は２０００"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "東方向（°）にすべての点をオフセット。デフォルト 0"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "北方向(度)にあるすべてのポイントのオフセット. デフォルト 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "陸地を検索する方向。既定は東。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "水域、海岸線、陸地、あるいは なし としてタグ付け。デフォルトは水域。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "軌跡をたどるのにどのWMSレイヤーを使用しますか。デフォルトは IR1です。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "各キャッシュディレクトリの最大サイズを指定します。既定は300MBです。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "キャッシュされたファイルの保持日数を指定します。既定は100日です。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "データ源。既定はLandsatです。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "ランドサット画像上での水域トレース用プラグイン"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakewalkerプラグインの設定"
@@ -14764,5 +15618,5 @@
 msgstr "OpenStreetBugs ダウンロード・ループ"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugsに報告された問題点を表示"
@@ -14792,5 +15646,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14807,14 +15660,22 @@
 "ん。"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugsを開く"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "OpenStreetBugs ウィンドウを開き、自動ダウンロードを有効化します"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14824,22 +15685,31 @@
 "ぎます"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "コメントの追加"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "コメントを入力してください"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "共有地"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "完了としてマーク"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "本当に閉じますか？"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14849,23 +15719,51 @@
 "ます:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "閉じる"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "新規問題点"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "問題の作成"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "問題を詳細に記述してください"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "作成日:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "あなたのユーザ名を入力してください"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "不明な問題点の状況"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugsを開く"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14887,10 +15785,10 @@
 msgstr "ファイルの拡張子が不明です: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14900,5 +15798,5 @@
 "を設定してください。"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
@@ -14908,37 +15806,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "APIからデータ読み込み"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "新しいオブジェクトを作成"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "選択の変更"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "表示領域を変更"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "全てのリモコン操作を手動で確認"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "JOSMをほかのアプリーケーションから制御できるようにするプラグインです。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "リモート制御"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "リモート制御プラグインの設定。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14949,5 +15847,5 @@
 "会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "許可されたアクション"
@@ -15065,25 +15963,25 @@
 msgstr "ルートの消去"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "ルーティング プラグインの設定"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "ルーティング設定情報の構成"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "ハイウェイ タイプ"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "速度 (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "重み付け"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "重みの値の入力"
@@ -15129,42 +16027,42 @@
 msgstr "画像 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "自動ズーム"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "タイルの自動読み込み"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "スリッピマップ プラグイン用設定"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "タイルソース"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "自動ズーム: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "タイルの自動読み込み "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr "最小ズームレベル: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "最大ズーム lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Fade background: "
@@ -15396,37 +16294,37 @@
 "{1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "無視リストを使う"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "警告を抑制するために、無視するリストを使用する"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "エラーレイヤーを使う"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "疑わしい要素を表示するために、エラーレイヤーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "アップロードの情報レベルを示してください。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "アップロードチェックウィンドウのお知らせテストを表示"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "要求に応じて"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "アップロード時"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15436,5 +16334,5 @@
 "ます。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "データ妥当性検証"
@@ -16042,5 +16940,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "建物"
@@ -16054,5 +16952,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "領域"
@@ -16460,55 +17358,55 @@
 msgstr "ファイルからデータをロードするためのブランクWMSレイヤーを開く"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "WMSプラグイン設定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "メニューの名前"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "メニュー名(既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (既定)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "メニュー名とWMS URLを入力"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "選択されたデフォルトをコピー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "コピーする列を少なくともひとつ選んでください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "ダウンローダ:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "タイルをオーバーラップ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "東の %"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "北の %"
@@ -18084,6 +18982,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "自動車専用道路"
@@ -18109,6 +19007,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "国道"
@@ -18134,6 +19032,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "主要地方道"
@@ -18159,6 +19057,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "一般地方道"
@@ -18172,5 +19070,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "一般道(2車線以上)"
@@ -18188,5 +19086,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "居住区域内道路"
@@ -18220,6 +19118,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "敷地内道路"
@@ -18253,6 +19151,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "工事中"
@@ -18302,5 +19200,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -19289,5 +20187,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "沼地、湿地"
@@ -20686,7 +21584,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "ストリート"
@@ -21414,28 +22312,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "スポーツ"
@@ -23131,4 +24029,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23163,9 +24069,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "緑"
@@ -24573,7 +25479,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "自転車"
@@ -24643,7 +25549,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "徒歩"
@@ -24669,5 +25575,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "地下鉄"
@@ -24963,5 +25869,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "破棄された"
@@ -25003,5 +25909,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "馬"
@@ -25111,4 +26017,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25146,5 +26058,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25217,11 +26129,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "バリア"
@@ -25284,5 +26196,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "車道"
@@ -25338,7 +26250,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "車線"
@@ -25409,9 +26321,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "線路"
@@ -25503,5 +26415,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "敷地内道路"
@@ -25515,5 +26427,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "浅瀬（洗い越し）"
@@ -25534,10 +26446,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "転回所"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25547,5 +26459,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "緊急アクセスポイント"
@@ -25560,5 +26472,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "川岸"
@@ -25572,5 +26484,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "小川"
@@ -25584,5 +26496,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "ドック"
@@ -25771,13 +26683,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "人工物"
@@ -25839,7 +26751,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "鉄道ポイント"
@@ -25862,10 +26774,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "高架鉄道"
@@ -25901,7 +26813,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "古い軌道"
@@ -25947,6 +26859,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "空路"
@@ -25960,5 +26872,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "駅"
@@ -25980,5 +26892,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -25992,5 +26904,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -26052,7 +26964,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "リフト"
@@ -26069,5 +26981,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -26082,5 +26994,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -26095,5 +27007,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -26108,5 +27020,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -26121,5 +27033,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -26134,5 +27046,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -26252,11 +27164,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "電力"
@@ -26270,5 +27182,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "桟橋"
@@ -26282,5 +27194,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "パイプライン"
@@ -26424,13 +27336,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "レジャー"
@@ -26444,5 +27356,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "マリーナ"
@@ -26538,10 +27450,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "アメニティ"
@@ -26643,14 +27555,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27046,5 +27965,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27069,23 +27988,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -27117,6 +28036,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "信号_水域"
@@ -27177,8 +28096,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "健康"
@@ -27531,26 +28450,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "店"
@@ -27622,8 +28541,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "ホテル"
@@ -27694,5 +28613,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27701,5 +28620,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27709,5 +28628,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27716,5 +28635,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27724,9 +28643,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "旅行関係"
@@ -27814,14 +28733,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "史跡"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27830,5 +28748,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "石切り場"
@@ -27842,5 +28760,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "埋め立て地"
@@ -27862,5 +28780,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -27874,5 +28792,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "森"
@@ -27886,5 +28804,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "農家の庭"
@@ -27907,5 +28825,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "小売りの商用地"
@@ -27919,5 +28837,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "工業地"
@@ -27931,5 +28849,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -27943,5 +28861,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "緑地"
@@ -27955,5 +28873,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "鉄道公園"
@@ -28010,7 +28928,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "軍用地"
@@ -28024,5 +28942,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "共同墓地"
@@ -28035,5 +28953,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "山頂"
@@ -28048,5 +28966,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "氷河"
@@ -28060,5 +28978,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "火山"
@@ -28113,8 +29031,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "自然"
@@ -28128,5 +29046,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "低木"
@@ -28140,5 +29058,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "荒地"
@@ -28152,5 +29070,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "森林エリア"
@@ -28164,5 +29082,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "泥"
@@ -28176,5 +29094,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "砂浜"
@@ -28252,8 +29170,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "ルート"
@@ -28276,4 +29194,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28301,7 +29260,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "行政区境"
@@ -28451,11 +29415,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "場所"
@@ -28503,6 +29467,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "住所"
@@ -28858,4 +29822,20 @@
 msgstr ""
 
+#~ msgid "Looking up available translations..."
+#~ msgstr "利用可能な翻訳を探しています ..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "OSMサーバのベースURL（REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "OSM アカウントへのログイン名(e-mail)。"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "OSM ユーザ名 (e-mail)"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -29055,7 +30035,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "OSMアカウントのログイン名（email)"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSMユーザ名（email）"
 
 #~ msgid "Enable proxy server"
@@ -29150,7 +30127,4 @@
 #~ msgstr "タイルの状態を表示"
 
-#~ msgid "Request Update"
-#~ msgstr "要求の更新"
-
 #~ msgid "error loading metadata"
 #~ msgstr "メタデータの読み込みエラー"
@@ -29317,7 +30291,4 @@
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "TCXファイルをTCXファイルとしてインポート"
-
-#~ msgid "Validate"
-#~ msgstr "検証"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -29944,4 +30915,7 @@
 #~ msgid "Use an open changeset"
 #~ msgstr "開かれた変更セットを使用"
+
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "現在の変更セットはヌルです。データをアップロードできません。"
 
 #~ msgid "Error: failed to add authentication credentials to the connection."
@@ -30129,2 +31103,5 @@
 #~ msgid "Illegal lat/lon value"
 #~ msgstr "不正な緯度/経度の値"
+
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 19246)
+++ applications/editors/josm/i18n/po/nb.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-25 13:19+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:34+0000\n"
 "Last-Translator: Tor Christian Tovslid <tctovsli@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:21+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Bygger opp hovedskjermbilde"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -295,4 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Fortsett"
@@ -323,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -337,7 +338,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -469,6 +473,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -547,5 +552,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -559,5 +564,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informasjon"
@@ -756,15 +761,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Slett"
@@ -842,6 +847,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1487,14 +1492,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Innstillinger …"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Åpne side med globale innstillinger."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -1638,17 +1644,17 @@
 msgstr "Hjelp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopier til utklippstavlen og lukk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1783,33 +1789,33 @@
 msgstr "Denne noden har ikke knytninger"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen av disse nodene har knytninger."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen noder i denne linjen har andre knytninger."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Valgte element har ikke knytninger som kan løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Velg:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* En node med egenskaper, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "– En node som brukes av flere linjer, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1817,10 +1823,10 @@
 "– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1833,9 +1839,9 @@
 "kopier og alle noder bli valgt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Node uten tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1843,5 +1849,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2006,4 +2012,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Tilbake"
@@ -3218,24 +3226,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Innstillinger lagret i {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Klarte ikke lese innstillinger fra tjener."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3244,5 +3252,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3253,5 +3261,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3665,6 +3673,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3830,5 +3838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3843,10 +3851,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "ferdselsvei"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3854,15 +3862,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vannvei"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "bruk av grunn"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3875,6 +3883,11 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Offentlig transport"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3883,5 +3896,5 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3923,9 +3936,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Tilkobling mislykkes"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Tilkobling mislykkes"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Ukjent vert"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4031,65 +4054,65 @@
 msgstr "Passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "bruk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Vis hjelp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix-geometri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Last ned områdeavgrensing"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Åpne fil (som rå gps, dersom .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Last ned områdeavgrensing som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Velg med gitt søkestreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Start maksimert"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Gå tilbake til standardinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Velg språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4098,9 +4121,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4110,25 +4133,25 @@
 "du prøver --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "I stedet for  --download=<bbox> kan du bruke osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Gjør opplastede programtillegg tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Laster første programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Setter standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Laster inn programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4141,5 +4164,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4148,5 +4171,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4254,5 +4277,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4947,5 +4970,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4960,5 +4983,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4966,5 +4989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5054,5 +5077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "ingen"
@@ -5232,5 +5255,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5242,5 +5265,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5335,5 +5358,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5342,5 +5365,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5421,13 +5444,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Legg til"
@@ -5558,54 +5581,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Åpne en liste over alle relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relasjoner: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Åpne en editor for den valgte relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Slet valgt relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Oprett ny relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6940,58 +6963,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6999,58 +7022,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7058,9 +7081,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7068,5 +7091,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7074,15 +7097,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7090,9 +7113,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7101,5 +7124,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7126,9 +7149,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Enkel"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7138,5 +7162,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7147,5 +7171,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7187,22 +7211,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7211,10 +7237,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7223,10 +7249,10 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7235,5 +7261,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7242,9 +7268,9 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Velg en verdi"
@@ -7272,61 +7298,57 @@
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, 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:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 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:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 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:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 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:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Utvalg"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Ingen relasjoner er valgt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Velg linjetegnings-innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Velg linjetegnings-innstillinger"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7382,5 +7404,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7394,12 +7416,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "Laster ned programtillegg {0} …"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8012,6 +8034,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9068,6 +9091,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9153,9 +9176,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9177,4 +9199,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9612,24 +9641,24 @@
 msgstr[1] "{0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Filer (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Fila {0} er lastet inn under navnet «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Feil oppsto ved sending av {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Klarte ikke lese «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9640,34 +9669,34 @@
 "<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Jeg er i tidssonen: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Ingen dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Åpne et annet foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 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:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9677,114 +9706,116 @@
 "Sjekk format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Ingen GPX-spor er lastet inn>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Åpne flere GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Automatisk forslag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Tidssone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Forskyvning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Jevnfør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidssone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9794,38 +9825,38 @@
 "synkronisere bildene manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Valgte foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 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:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9836,5 +9867,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9845,56 +9876,56 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Les bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leser {0} …"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Klarte ikke å lage fullstendig sti til mappa  {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanner mappa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fant tom fil i mappa {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, 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:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9902,22 +9933,22 @@
 msgstr[1] "bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} hadde gps posisjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10108,4 +10139,582 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Bruk globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Opphavsmenn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Brukernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Passord"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Roter med klokken"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Tilføy egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Opphavsmenn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Oppgi brukernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Oppgi brukernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Klarte ikke starte API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Adkomst"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Avanserte innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Oppgi brukernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Oppgi brukernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Velg minst én node eller linje."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Fant ingen treff for «{0}»"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Steng dialog og avbryt nedlasting"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Lukk dialogen og opprett et nytt punkt."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Last opp innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Be op Oppdatering"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- og "
+"tjeneroppføringer</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Klikk for å fjerne plassering"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Redningsmøtepunkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Klikk for å fjerne plassering"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Adkomst"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Oppdatering feilet"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "string;string;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10140,5 +10749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10146,5 +10755,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10152,7 +10761,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Velg raden som skal slettes"
@@ -10608,12 +11217,4 @@
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Behold sikkerhetskopier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet."
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10652,17 +11253,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Utseende og opplevelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Standard (automatisk valgt)"
@@ -10729,10 +11325,20 @@
 msgstr "Indstilling på programtillegg sider"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Lukk dialogen og opprett et nytt punkt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Avbryt konfliktløsning og lukk vinduet"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Visningsinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10742,29 +11348,29 @@
 "prorammet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Innstillinger for tilkobling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Innstillinger for forbindelse til OSM-tjeneren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Innstillinger for kart"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Innstilinger for kartprojeksjon og datafortolkning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Lydinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Innstillinger for avspilling av lyd og lyd markering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
@@ -10791,92 +11397,29 @@
 msgstr "Klarte ikke bruke projeksjonen {0}. Bruker Mercators projeksjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Attraksjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxy Innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "URL-adressen for OSM-tjeneren (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "E-postadresse for OSM-kontoen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-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."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL-adresse til tjener"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM-brukernavn (e-post)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM passord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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 lagres i ren tekst i innstillingsfila."
-"<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
-"<br><b>Ikke bruk et verdifullt passord.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11171,4 +11714,252 @@
 msgstr "Kombinasjonstast grupper:"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Tilkobling mislykkes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Bruk standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Behold sikkerhetskopier"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Lagre sikkerhetskopier med ~ i slutten av filnavnet."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM brukernavn (e-postadressen)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM passord"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>Advarsel: Passordet lagres i ren tekst i innstillingsfila."
+"<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
+"<br><b>Ikke bruk et verdifullt passord.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL-adresse til tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Valider"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Nåværende verdi er standard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11312,5 +12103,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11362,23 +12153,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11387,16 +12184,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11404,5 +12201,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11410,5 +12207,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11647,5 +12444,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11689,5 +12486,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11735,30 +12532,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Kode={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11923,4 +12720,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Uventet verdi for parameter «index». Leste {0}."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12217,23 +13029,28 @@
 "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Leser {0} …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12616,5 +13433,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12623,5 +13440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12631,5 +13448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12641,5 +13458,30 @@
 "datasett<br>bryter en forhåndsbetingelse.<br>Feilmelding:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12648,5 +13490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12655,5 +13497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12662,9 +13504,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12673,5 +13515,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12681,5 +13523,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12688,5 +13530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12695,5 +13537,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12702,10 +13544,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12714,10 +13556,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12728,5 +13570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12736,5 +13578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12745,18 +13587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12783,4 +13612,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13169,5 +14004,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13218,5 +14053,11 @@
 msgstr "Feil URL for lesing av Matrikkel."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13225,25 +14066,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Velg fra …"
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Velg kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Velg fra …"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13256,13 +14095,13 @@
 "Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Gjenopprett F11-hurtigtast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13270,34 +14109,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Bytt ut original bakgrunn med JOSM bakgrunnfarge."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Omvend grå farger (for svart bakgrunn)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Sett backgrunn transparent."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Vis grenser for nedlatede data."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Aktiviser automatisk mellomlager."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Max. lager størrelse (i MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13314,9 +14153,9 @@
 "<BR>før du laster inn data med dette programtillegget."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Fransk cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13324,10 +14163,10 @@
 "html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Kilde"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13336,5 +14175,5 @@
 "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13344,44 +14183,44 @@
 "tekst på mørk bakgrunn."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Tillat stabling av flere lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 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:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 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:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Fast kvadrat størrelse (standard er 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 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:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13495,5 +14334,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13501,14 +14340,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13516,14 +14355,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13531,21 +14370,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13658,28 +14497,28 @@
 msgstr "Blankt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, 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:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Er ikke vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Er vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13690,9 +14529,9 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -13700,38 +14539,38 @@
 "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Feil Lambert sone på mellomlager"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Bruk"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Velg en fargepalett"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Fargepalett"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Velg fargepalett for sletting"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Velg fargepalett i lista"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Lagre de brukte fargene i en ny farge palett."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Fjern valgte palett fra lista."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Farge Palett"
@@ -13893,6 +14732,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Oppdater"
@@ -14122,33 +14961,33 @@
 msgstr "Det oppstod en ukjent feil"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "øst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "nordøst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "nordvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "vest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "sørvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "sør"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "sørøst"
@@ -14188,5 +15027,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14197,81 +15036,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "vann"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "kystlinje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maksimalt antall segmenter per linje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maksimalt antall noder i første opptegning"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Max gråverdi for tolking som vann (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Nøyaktighetsgrense for forenkling av linje (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Oppløsning på Landsat kartbilder (pixler pr grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Størrelsen på Landsat kartbilder (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Flytt alle spor mot øst (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Flytt alle spor mot nord (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Retning for søk etter land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Egenskap for linjer"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS Lag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Max størrelse på mellomlager (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Max alder på mellomlager (dager)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Beskrivelse av kilde"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14280,5 +15119,5 @@
 "Max antall Noder som genereres (før linjer forenkles).Standard er 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14288,5 +15127,5 @@
 "Kan være 0-255. Standard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14296,5 +15135,5 @@
 "verdier gir flere noder og mer nøyaktige linjer. Standard er 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14303,21 +15142,21 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Størrelsen på Landsat bilder i pixler. Standard: 2000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Parallellflytt alle punkt mot øst (Grader).  Standard: 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Parallellflytt alle punkt mot nord (Grader).  Standard: 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Retning for søk etter land. Standard: øst."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14325,25 +15164,25 @@
 "water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Hvilket WMS lag danner bakgrunn for vektorisering. Standard: IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Max størrelse på hver mappe for mellomlager i bytes. Standard: 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Max alder for hver fil i mellomlager i dager. Standard: 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Beskrivelse av datakilde. Standard: Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Et tilleggsprogram for å vektorisere vannkant på Landsat bilder."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Innstillinger for Lakewalker tilleggsprogram"
@@ -14553,5 +15392,5 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Vis tema i  OpenStreetBugs"
@@ -14581,5 +15420,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14594,14 +15432,22 @@
 msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Åpne OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Åpner OpenStreetBugs-vinduet og starter automatisk nedlasting"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14611,22 +15457,31 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Legg til en merknad"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Skriv inn din merknad"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Offentlig"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Marker som utført"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Vil du virkelig lukke?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14636,23 +15491,51 @@
 "inn tilleggskommentar:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Lukk"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Ny feilrapport"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Oprett feilrapport"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Beskriv problemet nøyaktig"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Jevnfør"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Oppgi brukernavn"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Ukendt status for feilrapport"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Åpne OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14674,10 +15557,10 @@
 msgstr "Ukjent filtype {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14686,5 +15569,5 @@
 "Fant ikke Firefox. Oppgi Firefox-programmet i siden for Kartinnstillinger."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
@@ -14694,37 +15577,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "last inn data fra API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "bytt utvalg"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "bytt arbeidsutsnitt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "Bekreft alle Remote control handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Remote Control tilleggsprogram innstillinger."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14736,5 +15619,5 @@
 "fjernstyring av tilleggsprogrammet."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Tillatte handlinger"
@@ -14848,25 +15731,25 @@
 msgstr "Slett rute"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Innstillinger for Ruteplanlegger"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Oppsett for Ruteplanlegger"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Type ferdselsvei"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Fart (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Vekt"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Gi verdier for vekting"
@@ -14912,42 +15795,42 @@
 msgstr "bilde "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "Automatisk zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "Last kartbilder automatisk"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Innstillinger for SlippyMap programtillegg."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Kilder for kartbilder"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Autozoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Automatisk leste kartbilder: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max zoom niv: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Demp bakgrunn: "
@@ -15183,37 +16066,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Bruk Utelat Liste"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Bruk Utelat Liste for å undertrykke advarsler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Bruk Feil-Lag"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Bruk Feil-Laget for å vise element som skaper problem."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Vir Informasjonsnivå ved opplasting"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Vis test av informasjon i vinduet som sjekker opplastingen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Ved behov"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Ved opplasting"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15223,5 +16106,5 @@
 "programmer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Data-validator"
@@ -15827,5 +16710,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "bygning"
@@ -15839,5 +16722,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "område"
@@ -16231,55 +17114,55 @@
 msgstr "Åpne tomt WMS lag til data fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Innstillinger WMS Programtillegg"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Meny Navn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Standard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Gi meny navn og WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Nedlaster:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Overlapp kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17846,6 +18729,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
@@ -17871,6 +18754,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
@@ -17896,6 +18779,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "riksvei"
@@ -17921,6 +18804,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "fylkesvei"
@@ -17934,5 +18817,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "kommunevei"
@@ -17950,5 +18833,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "boligvei"
@@ -17982,6 +18865,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "adkomstvei"
@@ -18015,6 +18898,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "veiarbeid"
@@ -18064,5 +18947,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -19048,5 +19931,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "Myrområde"
@@ -20445,7 +21328,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "gate"
@@ -21173,28 +22056,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -22889,4 +23772,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22921,9 +23812,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "grønn"
@@ -24331,7 +25222,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "sykkel"
@@ -24401,7 +25292,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "fotgjenger"
@@ -24427,5 +25318,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "T-bane"
@@ -24721,5 +25612,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "uønsket"
@@ -24761,5 +25652,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "hest"
@@ -24869,4 +25760,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24904,5 +25801,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24975,11 +25872,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "hinder"
@@ -25042,5 +25939,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -25096,7 +25993,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "ferdselsvei – traktorvei"
@@ -25167,9 +26064,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "jernbane"
@@ -25261,5 +26158,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "service"
@@ -25273,5 +26170,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "vadested"
@@ -25292,10 +26189,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "vendesirkel"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25305,5 +26202,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "redningsmøtepunkt"
@@ -25318,5 +26215,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "elvebredd"
@@ -25330,5 +26227,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "bekk"
@@ -25342,5 +26239,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "tørrdokk"
@@ -25529,13 +26426,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -25597,7 +26494,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "jernbanepunkt"
@@ -25620,10 +26517,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "annen bane"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "jernbanebro"
@@ -25659,7 +26556,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "nedlagt bane"
@@ -25705,6 +26602,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "aeroway"
@@ -25718,5 +26615,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "stasjon"
@@ -25738,5 +26635,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -25750,5 +26647,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -25810,7 +26707,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "aerialway"
@@ -25827,5 +26724,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "nedfart enkel"
@@ -25840,5 +26737,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "nedfart middels"
@@ -25853,5 +26750,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "nedfart avansert"
@@ -25866,5 +26763,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "nedfart ekspert"
@@ -25879,5 +26776,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "nedfart friløp"
@@ -25892,5 +26789,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "nedfart nybegynner"
@@ -26010,11 +26907,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "kraft"
@@ -26028,5 +26925,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "brygge"
@@ -26040,5 +26937,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "rørgate"
@@ -26182,13 +27079,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "fritid"
@@ -26202,5 +27099,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "marina"
@@ -26296,10 +27193,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "fasilitet"
@@ -26401,14 +27298,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "fasilitet – trafikk"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26804,5 +27708,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26827,23 +27731,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "fasilitet – lys"
@@ -26875,6 +27779,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "light_vann"
@@ -26935,8 +27839,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "helse"
@@ -27289,26 +28193,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "butikk"
@@ -27380,8 +28284,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotell"
@@ -27452,5 +28356,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27459,5 +28363,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27467,5 +28371,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27474,5 +28378,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27482,9 +28386,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turisme"
@@ -27572,14 +28476,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historisk"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27588,5 +28491,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "steinbrudd"
@@ -27600,5 +28503,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -27620,5 +28523,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "vannmagasin"
@@ -27632,5 +28535,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "skog"
@@ -27644,5 +28547,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "gårdstun"
@@ -27665,5 +28568,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "butikker"
@@ -27677,5 +28580,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industri"
@@ -27689,5 +28592,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -27701,5 +28604,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "byggeområde"
@@ -27713,5 +28616,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -27768,7 +28671,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "millitært"
@@ -27782,5 +28685,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "gravlund"
@@ -27793,5 +28696,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "fjelltopp"
@@ -27806,5 +28709,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "isbre"
@@ -27818,5 +28721,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulkan"
@@ -27871,8 +28774,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "natur"
@@ -27886,5 +28789,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "krattskog"
@@ -27898,5 +28801,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "beiteområde"
@@ -27910,5 +28813,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27922,5 +28825,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "søle"
@@ -27934,5 +28837,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "strand"
@@ -28010,8 +28913,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "rute"
@@ -28034,4 +28937,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28059,7 +29003,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "grense"
@@ -28209,11 +29158,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "sted"
@@ -28261,6 +29210,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adresse"
@@ -28616,4 +29565,19 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "URL-adressen for OSM-tjeneren (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "E-postadresse for 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 "OSM username (e-mail)"
+#~ msgstr "OSM-brukernavn (e-post)"
+
 #~ msgid "Move"
 #~ msgstr "Flytt"
@@ -28868,7 +29832,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM brukernavn (e-postadressen)"
 
 #~ msgid ""
@@ -29085,7 +30046,4 @@
 #~ msgstr "osmarender-indstillinger"
 
-#~ msgid "Request Update"
-#~ msgstr "Be op Oppdatering"
-
 #~ msgid "requested: {0}"
 #~ msgstr "bestilt: {0}"
@@ -29135,7 +30093,4 @@
 #~ msgid "No intersections found. Nothing was changed."
 #~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
-
-#~ msgid "Validate"
-#~ msgstr "Valider"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -29315,7 +30270,4 @@
 #~ msgstr "Bare én node er valgt"
 
-#~ msgid "Update failed"
-#~ msgstr "Oppdatering feilet"
-
 #~ msgid "Update Data"
 #~ msgstr "Oppdater data"
@@ -29388,7 +30340,4 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Klarte ikke starte API. Prøv igjen senere."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Klarte ikke starte API"
 
 #~ msgid "Missing primitive"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 19246)
+++ applications/editors/josm/i18n/po/nl.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 19:32+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Hoofdscherm aanmaken"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -301,4 +301,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Doorgaan"
@@ -329,5 +330,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -343,7 +344,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -478,6 +482,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -556,5 +561,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -568,5 +573,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informatie"
@@ -767,15 +772,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Verwijderen"
@@ -853,6 +858,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1504,14 +1509,15 @@
 msgstr[1] "aan {0} primitieven"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Voorkeuren..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Open het voorkeurenscherm voor algemene instellingen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Voorkeuren"
@@ -1657,17 +1663,17 @@
 msgstr "Hulp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Klembord kopiëren en sluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1814,34 +1820,34 @@
 msgstr "De knoop is met niets anders verbonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Geen van deze knopen is met iets anders verbonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Geen van deze wegknopen is met iets anders verbonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selecteer één van beide:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Een getagde knoop, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* een knoop die gebruikt is door meer dan een weg, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1850,5 +1856,5 @@
 "weg, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1857,5 +1863,5 @@
 "één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1869,9 +1875,9 @@
 "geselecteerd worden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Ongebonden knoop"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1879,5 +1885,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2045,4 +2051,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Achteruit"
@@ -3284,24 +3292,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Voorkeuren opgeslagen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kan geen voorkeuren uploaden. Reden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Kan geen voorkeuren van server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3310,5 +3318,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3319,5 +3327,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3731,6 +3739,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3896,5 +3904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3909,10 +3917,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "snelweg"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3920,15 +3928,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "waterweg"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "grondgebruik"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3941,6 +3949,11 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Openbaar vervoer"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3949,5 +3962,5 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3989,9 +4002,19 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Verbinding is mislukt"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Verbinding is mislukt"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Onbekende host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4099,65 +4122,65 @@
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Open bestand (als rawe GPS, indien .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Gemaximaliseerd openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "De taal instellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4166,9 +4189,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4178,25 +4201,25 @@
 "zorg dat je wat gegevens laadt voor --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Bijgewerkte plugins activeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4211,5 +4234,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4218,5 +4241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4324,5 +4347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4983,5 +5006,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4996,5 +5019,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5002,5 +5025,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5090,5 +5113,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "geen"
@@ -5268,5 +5291,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5278,5 +5301,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5371,5 +5394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5378,5 +5401,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5461,13 +5484,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Toevoegen"
@@ -5598,54 +5621,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Een editor voor de geselecteerde relatie openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6982,58 +7005,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7041,58 +7064,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7100,9 +7123,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7110,5 +7133,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7116,15 +7139,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7132,9 +7155,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7143,5 +7166,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7168,9 +7191,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Basis"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7180,5 +7204,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7189,5 +7213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7229,22 +7253,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7253,10 +7279,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7265,10 +7291,10 @@
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7277,5 +7303,5 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7284,9 +7310,9 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
@@ -7314,61 +7340,57 @@
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Verwijder {0} relatie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Lijntekenopties selecteren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Lijntekenopties selecteren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Lijntekenopties selecteren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7424,5 +7446,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7436,12 +7458,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Laden van ouders van relatie {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8055,6 +8077,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9117,6 +9140,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9205,9 +9228,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9229,4 +9251,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9664,24 +9693,24 @@
 msgstr[1] "{0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Bestand {0} is geladen met de naam \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fout tijdens ontleden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kan \"{0}\" niet lezen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9693,34 +9722,34 @@
 "een tijdzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Fototijd (uit exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-tijd (lees uit de bovenstaande foto): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Ik bevind mij in tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Geen datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Open een andere foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9730,114 +9759,116 @@
 "Gebruik de verwachte indeling a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Ongeldige datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Nog geen GPX-track geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX-track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Een ander GPX-spoor openene"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Automatisch schatten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Verschuiving:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Correleer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Ongeldige verschuiving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tijdzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9845,21 +9876,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Koppelen van foto's aan track is mislukt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "De selecteerde foto's bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Foto's bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -9867,17 +9898,17 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX-track heeft geen tijdinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "U mag een GPX-track selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Geen GPX-tracks geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9888,5 +9919,5 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9897,56 +9928,56 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-locaties uit EXIF halen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Mappenscan starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Foto's lezen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lezen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Map {0} scannen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leeg bestand in {0} gevonden\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9954,22 +9985,22 @@
 msgstr[1] "afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} zijn getagd als GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10163,4 +10194,579 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Algemene instellingen gebruiken."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Auteurs"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Klik om samenvoegen van knooppunten te stoppen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanaal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Gebruikersnaam"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Wachtwoord"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Rechtsom roteren"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Eigenschappen toevoegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Auteurs"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Voer een gebruikersnaam in"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Voer een gebruikersnaam in"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Toegang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Uitgebreide voorkeuren"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Geef de zoekterm"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Voer een gebruikersnaam in"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Voer een gebruikersnaam in"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Selecteer ten minste één knoop of weg."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Geen overeenkomst gevonden voor ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Sluit dialoog en stop het downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Sluit het venster en maak een nieuwe knoop"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Voorkeuren uploaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Update aanvragen"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "EHBO-post"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Toegang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Verbinding is mislukt."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "string;string;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10192,5 +10798,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10198,5 +10804,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10204,7 +10810,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Selecteer een rij om te verwijderen."
@@ -10671,13 +11277,4 @@
 msgstr "OSM-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Backupbestanden behouden"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Tijdens het opslaan worden backupbestanden, eindigend op een ~, behouden."
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10716,17 +11313,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Weergave en Vormgeving"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Taal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Standaard (automatisch bepaald)"
@@ -10793,10 +11385,20 @@
 msgstr "Plugin-site configureren"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Sluit het venster en maak een nieuwe knoop"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Opgeloste conflicten toepassen en dialoog sluiten"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Beeldscherminstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10805,29 +11407,29 @@
 "Verschillende instellingen die het uiterlijk van het programma beïnvloeden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Verbindingsinstellingen voor de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Kaartinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Instellingen voor kaartprojectie en interpretatie van gegevens."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Geluidsinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Instellingen voor de geluidsspeler en geluidsmarkers."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
@@ -10854,87 +11456,28 @@
 msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Attractie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxyinstellingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "De basis-URL voor de OSM-server (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "URL-basisserver"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM-wachtwoord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11236,4 +11779,254 @@
 msgstr "Groepen aanpastoetsen"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Verbinding is mislukt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Gebruik de standaard"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Backupbestanden behouden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Tijdens het opslaan worden backupbestanden, eindigend op een ~, behouden."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM-gebruikersnaam (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM-wachtwoord"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>WAARSCHUWING: het wachtwoord wordt als gewone tekst in het "
+"voorkeurenbestand opgeslagen<br>en ook als gewone tekst naar de server "
+"verzonden, verwerkt in de URL.<br><b>Gebruik dus geen waardevol wachtwoord.</"
+"b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Voorkeuren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "URL-basisserver"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Valideren"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Huidige waarde is standaard."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11377,5 +12170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11427,23 +12220,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11452,16 +12251,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11469,5 +12268,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11475,5 +12274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11709,5 +12508,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11751,5 +12550,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11797,30 +12596,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11979,4 +12778,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12273,23 +13087,28 @@
 "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Lezen {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12674,5 +13493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12681,5 +13500,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12689,5 +13508,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12697,5 +13516,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12704,5 +13548,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12711,5 +13555,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12718,9 +13562,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12729,5 +13573,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12737,5 +13581,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12744,5 +13588,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12751,5 +13595,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12758,10 +13602,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12770,10 +13614,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12784,5 +13628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12792,5 +13636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12801,18 +13645,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12839,4 +13670,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13223,5 +14060,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13272,5 +14109,11 @@
 msgstr "CadastreGrabber: ongeldige URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13279,25 +14122,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Kies uit..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Gemeente selecteren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Kies uit..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Kadaster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Automatisch vullen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13306,13 +14147,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13320,34 +14161,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Grijstinten omkeren (voor zwarte achtergronden)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Achtergrond transparant maken."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Grenzen van gedownloade gegevens tekenen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Automatisch bufferen inschakelen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Max. buffergrootte (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13359,9 +14200,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Franse kadaster WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13369,10 +14210,10 @@
 "ingeschakeld</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Bron"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13382,5 +14223,5 @@
 "in de JOSM-voorkeuren is opgegeven."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13390,9 +14231,9 @@
 "tekst op donkere achtergronden."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Stapelen van meerdere lagen toestaan"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13400,37 +14241,37 @@
 "doorzichtig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Vaste vierkant groote (standaard is 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Vaste groote (van 25 tot 1000 meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13545,5 +14386,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13551,14 +14392,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13566,14 +14407,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13581,21 +14422,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13708,28 +14549,28 @@
 msgstr "Lege laag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-laag ({0}), {1} tegel(s) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Is niet gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Is gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Omvattende reschthoek gemeente: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13740,47 +14581,47 @@
 "Maak een nieuwe aan."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Fout in bufferstructuur"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Fout in buffer Lambert-zone"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Gebruik"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Selecteer een schema om te gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Kleurenschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Selecteer het schema om te verwijderen."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Het geselecteerde schema uit de lijst gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "De huidige kleuren als nieuw kleurenschema gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Het geselecteerde schema uit de lijst verwijderen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Kleurenschema's"
@@ -13942,6 +14783,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Herteken"
@@ -14171,33 +15012,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "oost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "noordoost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "noord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "noordwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "west"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "zuidwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "zuid"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "zuidoost"
@@ -14237,5 +15078,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14246,81 +15087,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "water"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "kustlijn"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maximum aantal segmenten per weg"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximum aantal knopen in oorspronkelijke spoor"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximale grijswaarde die als water geldt (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Nauwkeurigheid lijnvereenvoudiging (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolutie van Landsat-tegels (pixels per graad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Grootte van Landsat-tegels (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Alle sporen oostwaarts verschuiven (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Alle sporen noordwaarts verschuiven (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Richting om naar land te zoeken"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Wegen taggen als"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS-laag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maximale buffergrootte (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maximale bufferleeftijd (dagen)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Brontekst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14330,5 +15171,5 @@
 "50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14338,5 +15179,5 @@
 "IR-1-gegevens). Tussen 0-255, standaard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14347,5 +15188,5 @@
 "Standaard 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14353,47 +15194,47 @@
 "Resolutie van Landsat-tegels, gemeten in pixels per graad. Standaard 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Grootte van een landsat-tegel, gemeten in pixels. Standaard 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Alle punten oostwaarts verschuiven (graden). Standaard 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Alle punten noordwaarts verschuiven (graden). Standaard 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Richting om land te zoeken. Standaard oost."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Wegen als water, kustlijn, land of niets taggen. Standaard is water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Welke WMS-laag als achtergrond gebruiken voor tracing? Standaard is IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximum grootte van een buffermap in bytes. Standaard is 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximum leeftijd voor een gebufferd bestand in dagen. Standaard is 100."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Gegevensbron tekst. Standaard is Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Een plugin om waterlichamen op Landsat-beeldmateriaal te tracen."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Voorkeuren Lakewalker-plugin"
@@ -14603,5 +15444,5 @@
 msgstr "Downloadlus van OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-onderwerpen tonen"
@@ -14629,5 +15470,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14643,14 +15483,22 @@
 "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreetBugs openen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14660,22 +15508,31 @@
 "te downloaden"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Opmerkingen toevoegen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Voer je opmerking in"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Algemeen"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Als uitgevoerd markeren"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Zeker sluiten?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14683,23 +15540,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Sluiten"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nieuw onderwerp"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Onderwerp aanmaken"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Geef een nauwkeurige probleemomschrijving"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Correleer"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Voer een gebruikersnaam in"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Onderwerpstatus onbekend"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugs openen"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14721,10 +15606,10 @@
 msgstr "Onbekende bestandsextentie: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14734,5 +15619,5 @@
 "kaartinstellingenpagina van Voorkeuren."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox-executable"
@@ -14742,37 +15627,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "gegevens uit API laden"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "de selectie aanpassen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "het venster aanpassen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle remote-controlopdrachten handmatig bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Een plugin waarmee JOSM door andere applicaties geregeld kan worden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Afstandsbediening"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Instellingen voor de Afstandsbedieningsplugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14784,5 +15669,5 @@
 "applicaties die met deze plugin communiceren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Toegestane opdrachten"
@@ -14897,25 +15782,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14961,42 +15846,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "auto-zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "auto-laden tegels"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Instellingen voor de Slippy-kaartplugin"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Tegelbronnen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Auto-zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Auto-laden tegels: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max. zoom |v|: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Achtergrond vervagen: "
@@ -15228,37 +16113,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Uitzonderingslijst gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Gebruik uitzonderingslijst om waarschuwingen te onderdrukken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Gebruik foutenlaag."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Gebruik de foutenlaag om problematische elementen weer te geven."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Informatief niveau tijden upload tonen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Informatieve testen in de upload-controleschermen tonen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Op verzoek"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Tijdens uploaden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15268,5 +16153,5 @@
 "andere editors controleert."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Gegevensvalidator"
@@ -15880,5 +16765,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "gebouw"
@@ -15892,5 +16777,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "gebied"
@@ -16290,56 +17175,56 @@
 msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Voorkeuren WMS-plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Menunaam"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS-URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Menunaam (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS-URL (standaard)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Een menunaam en WMS-URL invoeren"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17877,6 +18762,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autosnelweg"
@@ -17902,6 +18787,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "autoweg"
@@ -17927,6 +18812,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "provinciale weg"
@@ -17952,6 +18837,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "N-weg"
@@ -17965,5 +18850,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
@@ -17981,5 +18866,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "woongebied"
@@ -18013,6 +18898,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "toegangsweg"
@@ -18046,6 +18931,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "werkzaamheden"
@@ -18095,5 +18980,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rotonde"
@@ -19079,5 +19964,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "moeras"
@@ -20476,7 +21361,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "straat"
@@ -21204,28 +22089,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -22920,4 +23805,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22952,9 +23845,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "groen"
@@ -24362,7 +25255,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "fiets"
@@ -24432,7 +25325,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "voet"
@@ -24458,5 +25351,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro"
@@ -24752,5 +25645,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "vervallen"
@@ -24792,5 +25685,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "paard"
@@ -24900,4 +25793,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24935,5 +25834,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25006,11 +25905,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -25073,5 +25972,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -25127,7 +26026,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "snelwegroute"
@@ -25198,9 +26097,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "spoor"
@@ -25292,5 +26191,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25304,5 +26203,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25323,10 +26222,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "Omkeermogelijkheid"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25336,5 +26235,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25349,5 +26248,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "rivierbank"
@@ -25361,5 +26260,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "stroom"
@@ -25373,5 +26272,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "dok"
@@ -25560,13 +26459,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "kunstmatig"
@@ -25628,7 +26527,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "spoorwegpunt"
@@ -25651,10 +26550,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "ander spoor"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "spoorovergang"
@@ -25690,7 +26589,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "oud spoor"
@@ -25736,6 +26635,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "luchtverbinding"
@@ -25749,5 +26648,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -25769,5 +26668,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "luchtverbinding_donker"
@@ -25781,5 +26680,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "luchtverbinding_licht"
@@ -25841,7 +26740,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "kabelbaan"
@@ -25858,5 +26757,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "piste_eenvoudig"
@@ -25871,5 +26770,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "piste_middelmatig"
@@ -25884,5 +26783,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "piste_gevorderden"
@@ -25897,5 +26796,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25910,5 +26809,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "piste_vrijekuur"
@@ -25923,5 +26822,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "piste_beginner"
@@ -26041,11 +26940,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "kracht"
@@ -26059,5 +26958,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "pijler"
@@ -26071,5 +26970,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "pijplijn"
@@ -26213,13 +27112,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "vrije tijd"
@@ -26233,5 +27132,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "jachthaven"
@@ -26327,10 +27226,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "voorziening"
@@ -26432,14 +27331,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "voorziening_verkeer"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26835,5 +27741,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26858,23 +27764,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "voorziening_licht"
@@ -26906,6 +27812,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "licht_water"
@@ -26966,8 +27872,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "gezondheid"
@@ -27320,26 +28226,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "winkel"
@@ -27411,8 +28317,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27483,5 +28389,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27490,5 +28396,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27498,5 +28404,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27505,5 +28411,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27513,9 +28419,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "toerisme"
@@ -27603,14 +28509,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historisch"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27619,5 +28524,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "mijnbouw"
@@ -27631,5 +28536,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -27651,5 +28556,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "estuarium"
@@ -27663,5 +28568,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "bosbouw"
@@ -27675,5 +28580,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -27696,5 +28601,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "winkelcentrum"
@@ -27708,5 +28613,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industrieel"
@@ -27720,5 +28625,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -27732,5 +28637,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -27744,5 +28649,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -27799,7 +28704,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "militair gebruik"
@@ -27813,5 +28718,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -27824,5 +28729,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -27837,5 +28742,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "gletsjer"
@@ -27849,5 +28754,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulkaan"
@@ -27902,8 +28807,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "Natuurlijk"
@@ -27917,5 +28822,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "ruig land"
@@ -27929,5 +28834,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "heide"
@@ -27941,5 +28846,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "houtland"
@@ -27953,5 +28858,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "slikgronden"
@@ -27965,5 +28870,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "strand"
@@ -28041,8 +28946,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "route"
@@ -28065,4 +28970,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28090,7 +29036,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "grens"
@@ -28240,11 +29191,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "plaats"
@@ -28292,6 +29243,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adres"
@@ -28647,4 +29598,12 @@
 msgstr "Sicilië - Italië"
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "De basis-URL voor de OSM-server (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
+
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecteer eerst een bladwijzer."
@@ -28960,7 +29919,4 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "TCX-bestand importeren..."
-
-#~ msgid "Request Update"
-#~ msgstr "Update aanvragen"
 
 #~ msgid "error requesting update"
@@ -29039,17 +29995,4 @@
 #~ msgstr "Kan niet lezen van URL: \"{0}\""
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-gebruikersnaam (e-mail)"
-
-#~ 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>WAARSCHUWING: het wachtwoord wordt als gewone tekst in het "
-#~ "voorkeurenbestand opgeslagen<br>en ook als gewone tekst naar de server "
-#~ "verzonden, verwerkt in de URL.<br><b>Gebruik dus geen waardevol "
-#~ "wachtwoord.</b></html>"
-
 #~ msgid "help"
 #~ msgstr "hulp"
@@ -29093,7 +30036,4 @@
 #~ msgid "zoom"
 #~ msgstr "zoom"
-
-#~ msgid "Validate"
-#~ msgstr "Valideren"
 
 #~ msgid "Validate either current selection or complete dataset."
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 19246)
+++ applications/editors/josm/i18n/po/pl.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 20:01+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:25+0000\n"
 "Last-Translator: Yarl <carebone@gmail.com>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -20,5 +21,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -27,5 +28,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
@@ -92,9 +93,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -121,5 +122,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -127,6 +128,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -138,9 +139,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -179,5 +180,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -205,6 +205,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -297,4 +297,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Kontynuuj"
@@ -325,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -339,7 +340,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -473,6 +477,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -551,5 +556,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -563,5 +568,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informacje"
@@ -762,15 +767,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Usuń"
@@ -850,6 +855,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1493,14 +1498,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Ustawienia..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Otwiera okno ustawień programu."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Ustawienia"
@@ -1645,17 +1651,17 @@
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Raport konfiguracji"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Skopiuj do schowka i zamknij"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1794,29 +1800,29 @@
 msgstr "Ten węzeł nie jest przyklejony do niczego więcej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Żaden z tych węzłów nie jest przyklejony do niczego więcej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Wybierz przynajmniej:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Jeden węzęł z tagami lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
@@ -1824,5 +1830,5 @@
 "tych dróg lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1831,5 +1837,5 @@
 "drogę, lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1838,5 +1844,5 @@
 "niż jedną drogę."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1846,9 +1852,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Rozdzielenie węzła"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1856,5 +1862,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2021,4 +2027,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Wstecz"
@@ -3215,24 +3223,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencje zostały zapisane na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Pobranie preferencji z serwera nie powiodło się."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3241,5 +3249,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3250,5 +3258,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3664,6 +3672,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3830,5 +3838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3843,10 +3851,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "droga"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3854,15 +3862,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "szlak wodny"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "zagospodarowanie przestrzenne"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3876,6 +3884,11 @@
 msgstr[2] "{0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Transport publiczny"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3885,5 +3898,5 @@
 msgstr[2] "{0} elementów"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3925,9 +3938,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Nieznany adres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4027,65 +4050,65 @@
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Ustaw język"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4094,9 +4117,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4104,25 +4127,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktywacja zaktualizowanych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4135,5 +4158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4142,5 +4165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4248,5 +4271,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4904,5 +4927,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4917,5 +4940,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4923,5 +4946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5011,5 +5034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr ""
@@ -5191,5 +5214,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5201,5 +5224,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5294,5 +5317,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5301,5 +5324,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5380,13 +5403,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Dodaj"
@@ -5517,54 +5540,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relacje"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Otwiera listę wszystkich relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Otwiera okno edycji dla zaznaczonej relacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Usuwa zaznaczoną relację."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Utwórz nową relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6900,58 +6923,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6959,58 +6982,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7018,9 +7041,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7028,5 +7051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7034,15 +7057,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7050,9 +7073,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7061,5 +7084,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7086,9 +7109,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Podstawowe"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7098,5 +7122,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7107,5 +7131,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7147,22 +7171,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7171,10 +7197,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7183,10 +7209,10 @@
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7196,5 +7222,5 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7204,9 +7230,9 @@
 msgstr[2] "Ta operacja może zmienić {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
@@ -7234,61 +7260,57 @@
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Zaznaczenie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Wybierz opcje rysowania linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Wybierz opcje rysowania linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Wybierz opcje rysowania linii"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7344,5 +7366,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7356,11 +7378,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7974,6 +7996,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9015,6 +9038,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9100,9 +9123,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9124,4 +9146,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9563,24 +9592,24 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Pliki GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Błąd podczas przetwarzania {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nie można odczytać \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9589,34 +9618,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Brak daty"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Otwórz inne zdjęcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9626,114 +9655,116 @@
 "Proszę użyć wybranego formatu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Nieprawidłowa data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "Scieżka GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Strefa czasowa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9741,38 +9772,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9781,5 +9812,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9788,56 +9819,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Pobieranie lokalizacji GPS z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Wczytywanie {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Przeglądanie katalogu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9846,22 +9877,22 @@
 msgstr[2] "obrazów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10051,4 +10082,576 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Użyj ustawień globalnych."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autorzy"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "kanał"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nazwa użytkownika"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Hasło"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Obróć w prawo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Dodaj właściwości"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autorzy"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Podaj nazwę użytkownika"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Podaj nazwę użytkownika"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Inicjalizacja API nie powiodła się."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Dostęp do drogi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Ustawienia zaawansowane"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Podaj nazwę użytkownika"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Podaj nazwę użytkownika"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Wybierz co najmniej jeden węzeł lub drogę."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Nie znaleziono nic szukając ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Zamknij okno i porzuć pobieranie"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Wyślij Ustawienia"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "handel"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "restauracja"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Dostęp do drogi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Aktualizacja się nie powiodła"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "tekst;tekst;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10082,5 +10685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10088,5 +10691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10094,7 +10697,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Proszę wybrać wiersz do usunięcia"
@@ -10536,13 +11139,4 @@
 msgstr "Dane OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Pozostawiaj kopie zapasowe plików"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Podczas zapisywania, pozostawia kopie zapasowe pliku dodając ~ do nazwy"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10581,17 +11175,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Wygląd i zachowanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Język"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Domyślny (ustalony automatycznie)"
@@ -10658,10 +11247,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Przywróć domyślne ustawienia"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Ustawienia wyświetlania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10669,29 +11267,29 @@
 msgstr "Różnorodne ustawienia, które wpływają na wygląd programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Ustawienia połączenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Ustawienia połączenia z serwerem OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Ustawienia mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ustawienia odwzorowania kartograficznego oraz interpretacji danych."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Ustawienia audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Ustawienia odtwarzacza audio oraz znaczników audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -10720,86 +11318,28 @@
 msgstr "Projekcja {0} nie może zostać aktywowana. Używam Mercatora."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "atrakcja"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Ustawienia Proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Adres URL serwera OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Adres URL serwera"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Hasło OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11075,4 +11615,253 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Połączenie nie powiodło się."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Pozostawiaj kopie zapasowe plików"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"Podczas zapisywania, pozostawia kopie zapasowe pliku dodając ~ do nazwy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Użytkownik OSM (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Hasło OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień."
+"<br>Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem i "
+"jest częścią adresu.<br><b>Nie należy używać żadnych wartościowych haseł</"
+"b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Ustawienia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Adres URL serwera"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Zweryfikuj"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Ustawiona wartość jest wartością domyślną."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11217,5 +12006,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11267,23 +12056,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11292,16 +12087,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11309,5 +12104,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11315,5 +12110,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11549,5 +12344,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11591,5 +12386,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11637,30 +12432,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11819,4 +12614,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12114,23 +12924,28 @@
 "Internetem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Wczytywanie {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12515,5 +13330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12522,5 +13337,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12530,5 +13345,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12538,5 +13353,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12545,5 +13385,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12552,5 +13392,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12559,9 +13399,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12570,5 +13410,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12578,5 +13418,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12585,5 +13425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12592,5 +13432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12599,10 +13439,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12611,10 +13451,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12625,5 +13465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12633,5 +13473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12642,18 +13482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12681,4 +13508,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13065,5 +13898,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13114,5 +13947,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13121,25 +13960,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13148,13 +13985,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13162,34 +13999,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13201,18 +14038,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS katastru francuskiego"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13220,5 +14057,5 @@
 msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13226,44 +14063,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13374,5 +14211,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13380,14 +14217,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13395,14 +14232,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13410,21 +14247,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13533,28 +14370,28 @@
 msgstr "Pusta warstwa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13563,47 +14400,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Użyj"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Wybierz proszę schemat do użycia."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Schemat kolorów"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Wybierz proszę schemat do usunięcia."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Schematy kolorów"
@@ -13765,6 +14602,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Odśwież"
@@ -13991,33 +14828,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "wschód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "północny-wschód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "północ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "północny-zachód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "zachód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "południowy-zachód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "południe"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "południowy-wschód"
@@ -14057,5 +14894,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14066,80 +14903,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "woda"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "linia brzegowa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "ląd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Rozmiar kafli Landsat (w pikselach)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Oznacz drogi jako"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Warstwa WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maksymalny rozmiar pamięci podręcznej (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maksymalny wiek pamięci podręcznej (dni)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Tekst źródłowy"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14147,5 +14984,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14153,5 +14990,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14159,50 +14996,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14412,5 +15249,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Wyświetla problemy z OpenStreetBugs"
@@ -14437,5 +15274,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14450,14 +15286,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Aktywne problemy z OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14467,22 +15311,31 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Dodaj komentarz"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Wpisz swój komentarz"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "miejsce publiczne"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Oznacz jako załatwiony"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Na pewno zamknąć?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14490,23 +15343,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Zamknij"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nowy problem"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Utwórz nowy problem"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Dokładnie opisz problem"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Tworzenie obszarów."
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Podaj nazwę użytkownika"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Nieznany stan problemu"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Aktywne problemy z OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14528,10 +15409,10 @@
 msgstr "Nieznane rozszerzenie pliku: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14541,5 +15422,5 @@
 "Ustawienia mapy w ustawieniach programu."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Ścieżka do programu Firefox"
@@ -14549,37 +15430,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14588,5 +15469,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14700,25 +15581,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Prędkość (km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14764,42 +15645,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -15029,37 +15910,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Użyj listę ignorowanych"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Używa listę ignorowanych problemów by pominąć niektóre ostrzeżenia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Użyj warstwy błędów"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Używa warstwę z błędami aby wyświetlić problemowe elementy."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Na życzenie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Podczas wysyłania"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15069,5 +15950,5 @@
 "użytkowników i programy do edycji."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Weryfikacja danych"
@@ -15668,5 +16549,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "budynek"
@@ -15680,5 +16561,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "obszar"
@@ -16072,55 +16953,55 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Ustawienia wtyczki WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Nazwa w menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "Adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "URL WMS (domyślny)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17656,6 +18537,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada"
@@ -17681,6 +18562,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "droga ekspresowa"
@@ -17706,6 +18587,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "droga krajowa"
@@ -17731,6 +18612,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "droga wojewódzka"
@@ -17744,5 +18625,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "droga powiatowa"
@@ -17760,5 +18641,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "droga lokalna"
@@ -17792,6 +18673,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "droga serwisowa"
@@ -17825,6 +18706,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "w budowie"
@@ -17874,5 +18755,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rondo"
@@ -18858,5 +19739,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "marsze"
@@ -20255,7 +21136,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "ulica"
@@ -20983,28 +21864,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -22699,4 +23580,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22731,9 +23620,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "zielony"
@@ -24141,7 +25030,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr ""
@@ -24211,7 +25100,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24237,5 +25126,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro"
@@ -24531,5 +25420,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "przestarzały"
@@ -24571,5 +25460,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24679,4 +25568,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24714,5 +25609,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24785,11 +25680,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "bariera"
@@ -24852,5 +25747,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24906,7 +25801,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24977,9 +25872,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "kolej"
@@ -25071,5 +25966,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "serwis"
@@ -25083,5 +25978,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25102,10 +25997,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25115,5 +26010,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25128,5 +26023,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "brzeg rzeki"
@@ -25140,5 +26035,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "strumień"
@@ -25152,5 +26047,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "Dok"
@@ -25339,13 +26234,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25407,7 +26302,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25430,10 +26325,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25469,7 +26364,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "stare szyny kolejowe"
@@ -25515,6 +26410,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25528,5 +26423,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "Terminal"
@@ -25548,5 +26443,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25560,5 +26455,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25620,7 +26515,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "droga powietrzna"
@@ -25637,5 +26532,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25650,5 +26545,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25663,5 +26558,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25676,5 +26571,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25689,5 +26584,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25702,5 +26597,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25820,11 +26715,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "energia"
@@ -25838,5 +26733,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "nabrzeże"
@@ -25850,5 +26745,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr ""
@@ -25992,13 +26887,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "wypoczynek"
@@ -26012,5 +26907,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "marina"
@@ -26106,10 +27001,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "udogodnienie"
@@ -26211,14 +27106,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26614,5 +27516,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26637,23 +27539,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26685,6 +27587,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26745,8 +27647,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "zdrowie"
@@ -27099,26 +28001,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "sklep"
@@ -27190,8 +28092,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27262,5 +28164,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27269,5 +28171,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27277,5 +28179,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27284,5 +28186,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27292,9 +28194,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turystyka"
@@ -27382,14 +28284,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historia"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27398,5 +28299,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "kamieniołom"
@@ -27410,5 +28311,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -27430,5 +28331,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "Basen"
@@ -27442,5 +28343,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "las"
@@ -27454,5 +28355,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27475,5 +28376,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27487,5 +28388,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -27499,5 +28400,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27511,5 +28412,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27523,5 +28424,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -27578,7 +28479,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "Teren wojskowy"
@@ -27592,5 +28493,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "cmentarz"
@@ -27603,5 +28504,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "szczyt"
@@ -27616,5 +28517,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "lodowiec"
@@ -27628,5 +28529,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "wulkan"
@@ -27681,8 +28582,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27696,5 +28597,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27708,5 +28609,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "zdrowie"
@@ -27720,5 +28621,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27732,5 +28633,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "błoto"
@@ -27744,5 +28645,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "plaża"
@@ -27820,8 +28721,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "droga"
@@ -27844,4 +28745,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27869,7 +28811,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "granica"
@@ -28019,11 +28966,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "Miejsce"
@@ -28071,6 +29018,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adres"
@@ -28426,4 +29373,11 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Adres URL serwera OSM (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
+
 #~ msgid "Move"
 #~ msgstr "Przenieś"
@@ -28504,7 +29458,4 @@
 #~ msgstr "Wycofaj"
 
-#~ msgid "OSM username (email)"
-#~ msgstr "Użytkownik OSM (email)"
-
 #~ msgid "Enable proxy server"
 #~ msgstr "Używaj serwera proxy"
@@ -28542,7 +29493,4 @@
 #~ msgid "zoom"
 #~ msgstr "powiększenie"
-
-#~ msgid "Validate"
-#~ msgstr "Zweryfikuj"
 
 #~ msgid "osmarender options"
@@ -28640,14 +29588,4 @@
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "Znaleziono tag <member> w"
-
-#~ 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>UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień."
-#~ "<br>Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem "
-#~ "i jest częścią adresu.<br><b>Nie należy używać żadnych wartościowych "
-#~ "haseł</b></html>"
 
 #~ msgid "Could not read from URL: \"{0}\""
@@ -29051,12 +29989,6 @@
 #~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
 
-#~ msgid "API initialization failed"
-#~ msgstr "Inicjalizacja API nie powiodła się."
-
 #~ msgid "No data"
 #~ msgstr "Brak danych"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizacja się nie powiodła"
 
 #~ msgid "Update Selection"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 19246)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 19:49+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:20+0000\n"
 "Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:23+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Criando tela principal"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -302,4 +302,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Continuar"
@@ -330,5 +331,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -344,7 +345,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -478,6 +482,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -556,5 +561,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -568,5 +573,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informações"
@@ -767,15 +772,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Excluir"
@@ -854,6 +859,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1502,14 +1507,15 @@
 msgstr[1] "Para {0} primitivas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Preferências..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Abrir uma página de preferências para configurações globais"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Preferências"
@@ -1655,17 +1661,17 @@
 msgstr "Ajuda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Relatório Atual"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Copiar para área de transferência e fechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1809,33 +1815,33 @@
 msgstr "Este nó não esta grudado a nada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Nenhum destes nós está grudado a algo."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Nenhum dos nós destes caminhos está grudado a algo."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "A seleção atual não pode ser usada para desgrudar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selecione entre:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Um nó comentado, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Um nó que é usado em mais de um caminho, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Um nó que é usado em mais de um caminho e um destes caminhos, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1843,5 +1849,5 @@
 "* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1849,5 +1855,5 @@
 "* Um caminho e um ou mais de seus nós que são usados por mais de um caminho."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1862,9 +1868,9 @@
 "cópia e todos os nós serão selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nó não grudado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1872,5 +1878,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2041,4 +2047,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Voltar"
@@ -3291,24 +3299,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferências gravadas em {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Não foi possível enviar preferências. Motivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Não foi possível obter preferências do servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3317,5 +3325,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3326,5 +3334,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3738,6 +3746,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3903,5 +3911,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3916,10 +3924,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "rodovia"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3927,15 +3935,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "hidrovia"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "uso da terra"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3948,6 +3956,11 @@
 msgstr[1] "{0} nós"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Transporte Público"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3956,5 +3969,5 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3996,9 +4009,19 @@
 msgstr "Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Conexão falhou"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Conexão falhou"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Servidor desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4104,65 +4127,65 @@
 msgstr "Senha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opções"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Mostar essa ajuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Argumento padrão de geometria unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Baixar o retângulo limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir arquivo (como raw gps, se .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Baixar o retângulo limite como dados de gps brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Selecionar dentro da busca"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Executar em modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Resetar preferência para default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Escolha o idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/TRILHA/PARA/PASTA/DO/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4171,9 +4194,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4184,25 +4207,25 @@
 "alguma coisa antes de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Em vez de --download=<bbox>, você pode especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Ativando plugins atualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Carregando plugins anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Aplicando padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Carregando plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4215,5 +4238,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4222,5 +4245,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4328,5 +4351,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Usuário:"
@@ -5026,5 +5049,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5039,5 +5062,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5045,5 +5068,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5133,5 +5156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "nenhum"
@@ -5311,5 +5334,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5321,5 +5344,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5414,5 +5437,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5421,5 +5444,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5502,13 +5525,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Adicionar"
@@ -5639,54 +5662,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Abrir uma lista de de todas as relações."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relações: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Abrir um editor para a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Excluir a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Criar uma nova relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -7022,58 +7045,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7081,58 +7104,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7140,9 +7163,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7150,5 +7173,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7156,15 +7179,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7172,9 +7195,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7183,5 +7206,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7208,9 +7231,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Básico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7220,5 +7244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7229,5 +7253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7269,22 +7293,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7293,10 +7319,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7305,10 +7331,10 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7317,5 +7343,5 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7324,9 +7350,9 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
@@ -7354,61 +7380,57 @@
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Deletar da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Confirmar a exclusão da relação {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da chave selecionada para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Apagar {0} relação"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Selecionar opções de linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Selecionar opções de linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Selecionar opções de linha"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7464,5 +7486,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7476,12 +7498,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Carregando pais da relação {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8103,6 +8125,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9168,6 +9191,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9258,9 +9281,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9282,4 +9304,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9713,24 +9742,24 @@
 msgstr[1] "{0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Arcivo GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erro enquanto analisava {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Não foi possível ler \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9739,34 +9768,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Sem data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9774,114 +9803,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Data inválida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Deslocamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9889,38 +9920,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9929,5 +9960,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9936,56 +9967,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9993,22 +10024,22 @@
 msgstr[1] "imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10195,4 +10226,580 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Usar preferências globais."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autores"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Clique para cancelar a mesclagem de nós"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+msgid "Manual"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nome do Usuário"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Senha"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Girar para a direita"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Adicionar Propriedades"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autores"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Por favor entrar um nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Por favor entrar um nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Falha na initialização da API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Acesso"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Preferências Avançadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Digite a expressão de pesquisa"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Por favor entrar um nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Por favor entrar um nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Por favor selecione ao menos um nó ou caminho."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Não há valores coincidentes para ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Feche a mensagem e cancele a transferência"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Feche a janela de diálogo e crie um novo nó"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Enviar Preferências"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+msgid "Request Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Clique <strong>{0}</strong> para começar a combinar as minhas entradas "
+"e as deles</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurante"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Entrada de Emergência"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Acesso"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Atualização falhou"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "string;string;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10226,5 +10833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10232,5 +10839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10238,7 +10845,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Por favor, selecione a linha para apagar."
@@ -10686,12 +11293,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10730,17 +11329,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Aparência"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr ""
@@ -10807,10 +11401,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Feche a janela de diálogo e crie um novo nó"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Cancelar atualizações e fechar janela"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Configurações da tela"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10818,29 +11422,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Configurações de conexão"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Configuração de Som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Você precicar reiniciar JOSM para aplicar mudanças."
@@ -10867,86 +11471,28 @@
 msgstr "A projeção {0} nâo pode ser ativada. Usando Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Atração"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Configurações de Proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM senha"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11222,4 +11768,249 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Falha na conexão."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Usar padrão"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Nome do Usuário"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM senha"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Preferências"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Arquivos do servidor OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "Validação"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Valor atual é o padrão."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11363,5 +12154,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11413,23 +12204,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11438,16 +12235,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11455,5 +12252,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11461,5 +12258,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11695,5 +12492,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11737,5 +12534,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11783,30 +12580,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "Changeset atual é nulo. Não há como enviar os dados."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11965,4 +12762,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "valor inesperado do parâmetro \"index\": {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12260,23 +13072,28 @@
 "conexão de internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Lendo {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12659,5 +13476,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12666,5 +13483,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12674,5 +13491,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12684,5 +13501,30 @@
 "dados atual viola uma pré-condição.<br>A mensagem de erro é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12691,5 +13533,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12698,5 +13540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12705,9 +13547,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12716,5 +13558,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12724,5 +13566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12731,5 +13573,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12740,5 +13582,5 @@
 "problema com a tranferência de dados.<br>Detalhes(não-traduzidos): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12747,10 +13589,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12759,10 +13601,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12773,5 +13615,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12781,5 +13623,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12790,18 +13632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12830,4 +13659,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13214,5 +14049,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13263,5 +14098,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13270,25 +14111,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13297,13 +14136,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13311,34 +14150,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13350,18 +14189,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS do cadastre Francese"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13369,5 +14208,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13375,9 +14214,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Permitir empilhamento de camadas múltiplas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -13385,36 +14224,36 @@
 "esquerda é mais transparente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13525,5 +14364,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13531,14 +14370,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13546,14 +14385,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13561,21 +14400,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Leste"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Norte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13684,28 +14523,28 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13714,47 +14553,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Usar"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Esquema de cores"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13916,6 +14755,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Atualizar"
@@ -14142,33 +14981,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "leste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "nordeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "norte"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "noroeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "oeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "sudoeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "sul"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "sudeste"
@@ -14208,5 +15047,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14217,80 +15056,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "água"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "costa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "ilha"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valor máximo de cinza para se considerar como água (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14298,5 +15137,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14304,5 +15143,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14310,50 +15149,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Marcar caminhos como água, litoral, terra ou nenhum. Padrão é água."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14563,5 +15402,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14586,5 +15425,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14599,14 +15437,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Abre OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14614,22 +15460,30 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Adicionar um comentário"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Marcar como Terminada"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Fechar mesmo?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14637,23 +15491,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Fechar"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Criar áreas"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Por favor entrar um nome"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Abre OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14675,10 +15557,10 @@
 msgstr "Extensão de arquivo desconhecida: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14686,5 +15568,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14694,37 +15576,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Controle Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14733,5 +15615,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14845,25 +15727,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Velocidade (km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Peso"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14909,42 +15791,42 @@
 msgstr "imagen "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -15174,37 +16056,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Sob demanda"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15212,5 +16094,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15812,5 +16694,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr ""
@@ -15824,5 +16706,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -16215,55 +17097,55 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17797,6 +18679,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17822,6 +18704,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17847,6 +18729,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr ""
@@ -17872,6 +18754,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr ""
@@ -17885,5 +18767,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17901,5 +18783,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr ""
@@ -17933,6 +18815,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "serviço"
@@ -17966,6 +18848,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "construção"
@@ -18015,5 +18897,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rotatória"
@@ -18999,5 +19881,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20396,7 +21278,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "estrada"
@@ -21124,28 +22006,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "esporte"
@@ -22840,4 +23722,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22872,9 +23762,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24282,7 +25172,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr ""
@@ -24352,7 +25242,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24378,5 +25268,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "Metrô"
@@ -24672,5 +25562,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "depreciado"
@@ -24712,5 +25602,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "cavalo"
@@ -24820,4 +25710,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24855,5 +25751,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24926,11 +25822,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24993,5 +25889,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -25047,7 +25943,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "trilha_autoestrada"
@@ -25118,9 +26014,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "trilho"
@@ -25212,5 +26108,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25224,5 +26120,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25243,10 +26139,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "rótula"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25256,5 +26152,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25269,5 +26165,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "margem de rio"
@@ -25281,5 +26177,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "fluxo"
@@ -25293,5 +26189,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "doca"
@@ -25480,13 +26376,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25548,7 +26444,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "ponto de ferrovia"
@@ -25571,10 +26467,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25610,7 +26506,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25656,6 +26552,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "aerovia"
@@ -25669,5 +26565,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -25689,5 +26585,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "aerovia_escuro"
@@ -25701,5 +26597,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "aerovia_claro"
@@ -25761,7 +26657,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25778,5 +26674,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "pista_fácil"
@@ -25791,5 +26687,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "pista_intermediária"
@@ -25804,5 +26700,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "pista_avançada"
@@ -25817,5 +26713,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25830,5 +26726,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "pista_livre"
@@ -25843,5 +26739,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "pista_novatos"
@@ -25961,11 +26857,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "energia"
@@ -25979,5 +26875,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "pier"
@@ -25991,5 +26887,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "canalização"
@@ -26133,13 +27029,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "lazer"
@@ -26153,5 +27049,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "marina"
@@ -26247,10 +27143,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26352,14 +27248,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26755,5 +27658,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26778,23 +27681,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26826,6 +27729,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26886,8 +27789,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "saúde"
@@ -27240,26 +28143,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "loja"
@@ -27331,8 +28234,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27403,5 +28306,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27410,5 +28313,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27418,5 +28321,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27425,5 +28328,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27433,9 +28336,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turismo"
@@ -27523,14 +28426,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "histórico"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27539,5 +28441,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr ""
@@ -27551,5 +28453,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "aterro"
@@ -27571,5 +28473,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27583,5 +28485,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "floresta"
@@ -27595,5 +28497,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "fazenda"
@@ -27616,5 +28518,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "venda"
@@ -27628,5 +28530,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industrial"
@@ -27640,5 +28542,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "Área contaminada"
@@ -27652,5 +28554,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "campo"
@@ -27664,5 +28566,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27719,7 +28621,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "exército"
@@ -27733,5 +28635,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "Cemitério"
@@ -27744,5 +28646,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "cume"
@@ -27757,5 +28659,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "geleira"
@@ -27769,5 +28671,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulcão"
@@ -27822,8 +28724,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27837,5 +28739,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "arbusto"
@@ -27849,5 +28751,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27861,5 +28763,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27873,5 +28775,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "lama"
@@ -27885,5 +28787,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "praia"
@@ -27961,8 +28863,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "rota"
@@ -27985,4 +28887,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28010,7 +28953,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "limite"
@@ -28160,11 +29108,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "lugar"
@@ -28212,6 +29160,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "endereço"
@@ -28901,7 +29849,4 @@
 #~ msgstr "Faltando primitiva"
 
-#~ msgid "Update failed"
-#~ msgstr "Atualização falhou"
-
 #~ msgid "Update Selection"
 #~ msgstr "Atualizar Seleção"
@@ -28981,7 +29926,4 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Falha na initialização da API"
 
 #~ msgid ""
@@ -29278,2 +30220,5 @@
 #~ msgid "Replace"
 #~ msgstr "Substituir"
+
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 19246)
+++ applications/editors/josm/i18n/po/ro.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 19:29+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:02+0000\n"
 "Last-Translator: Adi Roiban <adi@roiban.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -20,5 +21,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:21+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -27,5 +28,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Se creează interfața grafică"
@@ -92,9 +93,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -121,5 +122,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -127,6 +128,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -138,9 +139,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -179,5 +180,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -205,6 +205,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -297,4 +297,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Continuă"
@@ -325,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -339,7 +340,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -473,6 +477,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -551,5 +556,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -563,5 +568,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informaţii"
@@ -760,15 +765,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Şterge"
@@ -846,6 +851,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1486,14 +1491,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Preferinţe..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Deschide o pagină de preferinţe pentru opţiunile globale"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Preferinţe"
@@ -1636,17 +1642,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1779,43 +1785,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1825,9 +1831,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1835,5 +1841,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1998,4 +2004,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr ""
@@ -3177,24 +3185,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3203,5 +3211,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3212,5 +3220,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3626,6 +3634,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3791,5 +3799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3804,10 +3812,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3815,15 +3823,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3836,6 +3844,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+msgid "public transport"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3844,5 +3856,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3884,9 +3896,19 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Inițializarea API-ului a eșuat"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Inițializarea API-ului a eșuat"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Gazdă necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -3986,65 +4008,65 @@
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4053,9 +4075,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4066,25 +4088,25 @@
 "că aţi încărcat date înainte de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4097,5 +4119,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4104,5 +4126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4210,5 +4232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4866,5 +4888,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4879,5 +4901,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4885,5 +4907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4973,5 +4995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "nici unul"
@@ -5151,5 +5173,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5161,5 +5183,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5254,5 +5276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5261,5 +5283,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5344,13 +5366,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Adaugă"
@@ -5481,54 +5503,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6863,58 +6885,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6922,58 +6944,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6981,9 +7003,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -6991,5 +7013,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -6997,15 +7019,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7013,9 +7035,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7024,5 +7046,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7049,9 +7071,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7061,5 +7084,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7070,5 +7093,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7110,22 +7133,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7134,10 +7159,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7146,10 +7171,10 @@
 msgstr "<diferit>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7158,5 +7183,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7165,9 +7190,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
@@ -7196,61 +7221,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Selecţie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7306,5 +7327,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7318,11 +7339,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7933,6 +7954,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8974,6 +8996,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9061,9 +9083,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9085,4 +9106,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9516,24 +9544,24 @@
 msgstr[2] "{0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Eroare la prelucrarea {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nu am putut citi \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9542,34 +9570,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9577,114 +9605,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9692,38 +9722,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9732,5 +9762,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9739,56 +9769,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Citesc {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9797,22 +9827,22 @@
 msgstr[2] "de imagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9996,4 +10026,563 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Utilizează opţiunile globale."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+msgid "Autorise URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+msgid "Manual"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Nume utilizator"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Parolă"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+msgid "Granted rights"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Modificare proprietăţi"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+msgid "Authorise now"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Vă rog introduceţi un şir de căutat"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Inițializarea API-ului a eșuat"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+msgid "Advanced OAuth parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Selectează te rog cel puțin o cale."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+msgid "Please enter an Access Token Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Vă rog selectaţi cel puţin patru noduri."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+msgid "Close the dialog and cancel authorisation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+msgid "Allow to read your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+msgid "Request Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Anulează"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+msgid "Success"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+msgid "Test failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "şir;şir;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10025,5 +10614,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10031,5 +10620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10037,7 +10626,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Vă rog selectaţi rândul care va fi şters."
@@ -10474,12 +11063,4 @@
 msgstr "Date OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10518,17 +11099,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Aspect"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Limbă"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr ""
@@ -10595,10 +11171,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Restabileşte preferinţele implicite"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Configurări afişare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10608,29 +11193,29 @@
 "program."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Configurări conexiune"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Opţiuni hartă"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
@@ -10657,88 +11242,27 @@
 msgstr "Proiecția {0} nu a putut fi activată. Se folosește Mercator."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
-"nici o parolă."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Adresă server principal"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "Parola OSM"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+msgid "Authentication"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#, fuzzy
+msgid "Proxy settings"
+msgstr "Opţiuni hartă"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11014,4 +11538,247 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Configurări conexiune"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Nume utilizator OSM (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "Parola OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Preferinţe"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Adresă server principal"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+#, fuzzy
+msgid "Validate"
+msgstr "Valoare"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+msgid "The current value isn't a valid URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11156,5 +11923,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11206,23 +11973,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11231,16 +12004,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11248,5 +12021,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11254,5 +12027,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11484,5 +12257,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11526,5 +12299,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11572,30 +12345,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11754,4 +12527,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12047,23 +12835,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Citesc {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12427,5 +13220,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12434,5 +13227,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12442,5 +13235,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12450,5 +13243,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12457,5 +13275,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12464,5 +13282,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12471,9 +13289,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12482,5 +13300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12490,5 +13308,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12497,5 +13315,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12504,5 +13322,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12511,10 +13329,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12523,10 +13341,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12537,5 +13355,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12545,5 +13363,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12554,18 +13372,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12592,4 +13397,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -12969,5 +13780,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13018,5 +13829,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13025,25 +13842,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13052,13 +13867,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13066,34 +13881,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13105,18 +13920,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13124,5 +13939,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13130,44 +13945,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13278,5 +14093,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13284,14 +14099,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13299,14 +14114,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13314,21 +14129,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13437,28 +14252,28 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13467,47 +14282,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13669,6 +14484,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr ""
@@ -13895,33 +14710,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr ""
@@ -13961,5 +14776,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -13970,80 +14785,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14051,5 +14866,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14057,5 +14872,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14063,50 +14878,50 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14316,5 +15131,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14339,5 +15154,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14352,14 +15166,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14367,22 +15189,30 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14390,23 +15220,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Alegeţi"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Creează Cerc"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Date OpenStreetMap"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14428,10 +15286,10 @@
 msgstr "Extensie fişier necunoscută : {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14439,5 +15297,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14447,37 +15305,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14486,5 +15344,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14598,25 +15456,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14662,42 +15520,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -14927,37 +15785,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -14965,5 +15823,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15563,5 +16421,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr ""
@@ -15575,5 +16433,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -15965,55 +16823,55 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17547,6 +18405,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17572,6 +18430,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
@@ -17597,6 +18455,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr ""
@@ -17622,6 +18480,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr ""
@@ -17635,5 +18493,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
@@ -17651,5 +18509,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr ""
@@ -17683,6 +18541,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17716,6 +18574,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17765,5 +18623,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr ""
@@ -18749,5 +19607,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20146,7 +21004,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr ""
@@ -20874,28 +21732,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr ""
@@ -22590,4 +23448,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22622,9 +23488,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24032,7 +24898,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr ""
@@ -24102,7 +24968,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24128,5 +24994,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr ""
@@ -24422,5 +25288,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24462,5 +25328,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24570,4 +25436,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24605,5 +25477,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24676,11 +25548,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24743,5 +25615,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24797,7 +25669,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24868,9 +25740,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -24962,5 +25834,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -24974,5 +25846,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -24993,10 +25865,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25006,5 +25878,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25019,5 +25891,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr ""
@@ -25031,5 +25903,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr ""
@@ -25043,5 +25915,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25230,13 +26102,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25298,7 +26170,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25321,10 +26193,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25360,7 +26232,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25406,6 +26278,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25419,5 +26291,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25439,5 +26311,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25451,5 +26323,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25511,7 +26383,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25528,5 +26400,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25541,5 +26413,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25554,5 +26426,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25567,5 +26439,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25580,5 +26452,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25593,5 +26465,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25711,11 +26583,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25729,5 +26601,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr ""
@@ -25741,5 +26613,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr ""
@@ -25883,13 +26755,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr ""
@@ -25903,5 +26775,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -25997,10 +26869,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26102,14 +26974,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26505,5 +27384,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26528,23 +27407,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26576,6 +27455,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26636,8 +27515,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr ""
@@ -26990,26 +27869,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr ""
@@ -27081,8 +27960,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr ""
@@ -27153,5 +28032,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27160,5 +28039,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27168,5 +28047,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27175,5 +28054,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27183,9 +28062,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr ""
@@ -27273,14 +28152,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr ""
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27289,5 +28167,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr ""
@@ -27301,5 +28179,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27321,5 +28199,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27333,5 +28211,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr ""
@@ -27345,5 +28223,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27366,5 +28244,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27378,5 +28256,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr ""
@@ -27390,5 +28268,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27402,5 +28280,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27414,5 +28292,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27469,7 +28347,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr ""
@@ -27483,5 +28361,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr ""
@@ -27494,5 +28372,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr ""
@@ -27507,5 +28385,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr ""
@@ -27519,5 +28397,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr ""
@@ -27572,8 +28450,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27587,5 +28465,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27599,5 +28477,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27611,5 +28489,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27623,5 +28501,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr ""
@@ -27635,5 +28513,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr ""
@@ -27711,8 +28589,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr ""
@@ -27735,4 +28613,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27760,7 +28679,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr ""
@@ -27910,11 +28834,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -27962,6 +28886,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr ""
@@ -28317,4 +29241,10 @@
 msgstr ""
 
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
+#~ "nici o parolă."
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Parolă sau nume utilizator incorecte."
@@ -28331,7 +29261,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Apăsaţi Reîncarcă pentru a reîmprospăta lista"
-
-#~ msgid "Revert"
-#~ msgstr "Anulează"
 
 #~ msgid "Object"
@@ -28417,7 +29344,4 @@
 #~ msgstr "Nume autentificare (email) pentru contul OSM."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "Nume utilizator OSM (email)"
-
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
@@ -28485,7 +29409,4 @@
 #~ msgstr "Eroare la inițializarea API-ului. Vă rog încercați mai târziu."
 
-#~ msgid "API initialization failed"
-#~ msgstr "Inițializarea API-ului a eșuat"
-
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Nu am putut citi \"{0}\""
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 19246)
+++ applications/editors/josm/i18n/po/ru.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,7 +12,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-26 13:15+0000\n"
-"Last-Translator: kruvalig <Unknown>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-06 20:58+0000\n"
+"Last-Translator: Sergei Egorov <serikst@bk.ru>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,5 +21,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:22+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -26,5 +27,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
@@ -91,9 +92,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -120,5 +121,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -126,6 +127,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -137,9 +138,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -178,5 +179,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -204,6 +204,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -303,4 +303,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Продолжить"
@@ -309,5 +310,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr "Нажмите, чтобы продолжить и открыть {0} в браузере"
+msgstr "Нажмите, чтобы продолжить и открыть {0} браузеров"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
@@ -331,5 +332,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -345,7 +346,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -366,5 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr "Нажмите, чтобы отменить запуск внешнего браузера"
+msgstr "Нажмите, чтобы отменить запуск внешних браузеров"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -481,6 +485,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -559,5 +564,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -571,5 +576,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Информация"
@@ -643,5 +648,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr ""
+msgstr "Менеджер пакета правок"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
@@ -770,15 +775,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Удалить"
@@ -856,6 +861,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1071,4 +1076,6 @@
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
+"Пожалуйста, выберите по меньшей мере одну замкнутую линию, которую нужно "
+"присоединить."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
@@ -1354,18 +1361,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:118
 msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr ""
+msgstr "<html>Невозможно открыть каталог.<br>Пожалуйста, выберите файл!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
 msgid "Open file"
-msgstr ""
+msgstr "Открыть файл"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Открытие 1 файла..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
 #, java-format
 msgid "Opening {0} files..."
-msgstr ""
+msgstr "Открытие {0} файлов..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1518,14 +1525,15 @@
 msgstr[2] "для элементов {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Настройки..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Изменить настройки программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Настройки"
@@ -1672,17 +1680,17 @@
 msgstr "Справка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Отчёт о состоянии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Скопировать в буфер и закрыть"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1833,40 +1841,40 @@
 msgstr "Данная точка ни к чему не прикреплена."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ни одна из этих точек ни к чему не прикреплена."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 "Ни одна из этих точек, находящихся на линиях, ни к чему не прикреплена."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Выделенные объекты невозможно разъединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Выберите один из вариантов:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Одна точка с тегами, либо"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Одна точка, используемая несколькими линиями, либо"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Одна точка, используемая несколькими линиями и одной из этих линий, либо"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Одна линия, имеющая точки, используемые несколькими линиями, либо"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1875,5 +1883,5 @@
 "несколькими линиями."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1886,9 +1894,9 @@
 "и все точки будут выделены."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Неприкрепленная точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1896,5 +1904,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2063,4 +2071,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Назад"
@@ -2566,6 +2576,6 @@
 "min-max)"
 msgstr ""
-"<b>nodes:</b>... - объект с заданным количеством узлов (nodes:count or nodes:"
-"min-max)"
+"<b>nodes:</b>... - объект с заданным количеством точек (nodes:count или "
+"nodes:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
@@ -2582,6 +2592,6 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
-"<b>timestamp:</b>... -  объект с временной меткой (<b>2009-11-12T14:51:09Z</"
-"b>, <b>2009-11-12</b> или <b>T14:51</b> ...)"
+"<b>timestamp:</b>... - объект с этой меткой времени (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> или <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
@@ -2729,5 +2739,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:636
 msgid "Missing right parenthesis"
-msgstr ""
+msgstr "Отсутствует закрывающая скобка"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:639
@@ -2769,5 +2779,5 @@
 #, java-format
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
-msgstr ""
+msgstr "Неверное значение пакета правок оператора: {0}. Ожидалось число."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722
@@ -3044,15 +3054,15 @@
 #, java-format
 msgid "Set the 'modified' flag for node {0}"
-msgstr "Установить флаг 'modified' для узла {0}"
+msgstr "Установить флаг 'modified' для точки {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
 #, java-format
 msgid "Set the 'modified' flag for way {0}"
-msgstr "Установить флаг 'modified' для пути {0}"
+msgstr "Установить флаг 'modified' для линии {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
 #, java-format
 msgid "Set the 'modified' flag for relation {0}"
-msgstr "Установить флаг 'modified' для отношения связи {0}"
+msgstr "Установить флаг 'modified' для отношения {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
@@ -3351,24 +3361,24 @@
 "''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Параметры сохранены на {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Невозможно загрузить параметры. Причина: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Невозможно скачать параметры с сервера."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr "Ошибка: Неожиданная строка ''{0}'' в списке закладок с сервера"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3379,5 +3389,5 @@
 "с сервера"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3390,6 +3400,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr "Не удалось загрузить ресурс ''{0}''. Ошибка: {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3582,5 +3592,5 @@
 #, java-format
 msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-msgstr "Ожидается что ''{0}'' >= 0, а получено {1}"
+msgstr "Ожидался параметр ''{0}'' >= 0, получено {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
@@ -3590,6 +3600,6 @@
 "{0}"
 msgstr ""
-"Невозможно связать changesetId > 0 с новым примитивом. Заданное значение "
-"changesetId - {0}"
+"Невозможно назначить changesetId > 0 на новый элемент. Значение changesetId "
+"- {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1040
@@ -3826,6 +3836,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3992,8 +4002,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
+msgstr "Не показывать снова (запомнить выбор)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -4008,10 +4018,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "дорога"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -4019,15 +4029,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "водоём"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "землепользование"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -4041,6 +4051,11 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Общественный транспорт"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -4050,5 +4065,5 @@
 msgstr[2] "{0} участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4090,9 +4105,19 @@
 msgstr "Конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Ошибка при подключении"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Ошибка при подключении"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Неизвестный хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Объект удалён"
@@ -4198,65 +4223,65 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Открыть файл (как данные GPS, если .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Восстановить параметры по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Установить язык."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4268,9 +4293,9 @@
 "      настройки Java для увеличения максимально размера используемой памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4280,25 +4305,25 @@
 "убедитесь, что загружаете данные перед --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Включение обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4313,5 +4338,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4320,5 +4345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4428,5 +4453,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Пользователь:"
@@ -5136,5 +5161,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5149,5 +5174,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5155,5 +5180,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5245,5 +5270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "ничего"
@@ -5433,5 +5458,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5443,5 +5468,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5481,9 +5506,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Пакеты правок"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:262
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Открыть список набора правок в текущем слое."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:307
@@ -5516,9 +5541,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:473
 msgid "Details"
-msgstr ""
+msgstr "Подробности"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:474
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
+msgstr "Открыть окно менеджера набора правок для выбранных наборов правок"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5537,5 +5562,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5544,5 +5569,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5631,13 +5656,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Добавить"
@@ -5731,5 +5756,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:254
 msgid "Delete the selected layers."
-msgstr ""
+msgstr "Удалить выбранные слои."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
@@ -5768,54 +5793,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношения: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Установить текущий выбор на списке выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "Выделите участников всех выбранных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "Выбрать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "Скачать с сервера всех участников выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "Скачать участников"
@@ -5847,5 +5872,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
-msgstr "выделение"
+msgstr "Выделение"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:347
@@ -5924,13 +5949,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
 msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Отобразить основные параметры набора правок"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
 msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Отобразить теги набора правок"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
 msgid "Content"
-msgstr ""
+msgstr "Содержимое"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
@@ -5946,5 +5971,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
 msgid "Query"
-msgstr ""
+msgstr "Запрос"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
@@ -6000,15 +6025,15 @@
 msgctxt "changeset.upload-comment"
 msgid "empty"
-msgstr ""
+msgstr "пусто"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
 msgctxt "changeset.open"
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
 msgctxt "changeset.open"
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
@@ -6020,9 +6045,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
@@ -6033,5 +6058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr ""
+msgstr "Создано"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
@@ -7155,58 +7180,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7214,58 +7239,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7273,9 +7298,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7283,5 +7308,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7289,15 +7314,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7305,9 +7330,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7316,5 +7341,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7341,9 +7366,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Основной"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7353,5 +7379,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7362,5 +7388,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7402,22 +7428,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7427,10 +7455,10 @@
 msgstr[2] "Это изменит {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr "Пустое значение удаляет тег."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7439,10 +7467,10 @@
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7452,5 +7480,5 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7460,9 +7488,9 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Выберите значение"
@@ -7490,61 +7518,57 @@
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Удалить из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Удалить {0} отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Нет выделенного отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Выбрать варианты отрисовки линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Выбрать варианты отрисовки линий"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7603,5 +7627,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7621,11 +7645,11 @@
 "Скачивание с сервера {0} неполных дочерних элементов отношения ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr "Скачивание отношений с сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}: Скачивание отношения ''{2}''..."
 
@@ -8285,6 +8309,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9425,6 +9450,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9522,9 +9547,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9546,4 +9570,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -10022,24 +10053,24 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Файлы GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файл {0} загружен под именем \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Ошибка разбора {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Невозможно прочитать \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10051,34 +10082,34 @@
 "прочитаете на фото и выберите часовой пояс <hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Время фотоснимка (из EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Время GPS (прочтите на фото вверху): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Я нахожусь в часовом поясе: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Без даты"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Открыть другое фото"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизировать время по фотографии из GPS-приемника"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -10088,114 +10119,116 @@
 "Пожалуйста, используйте запрашиваемый формат"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Недопустимая дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Не загружены треки GPX>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "Трек GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Открыть другой трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Авто-Угадывание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Часовой пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Сопоставить изображения с GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Совпадения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Недопустимый часовой пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Недопустимое смещение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовой пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минуты: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунды: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10205,21 +10238,21 @@
 "можете вручную совместить фотографии с помощью движков."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Сопоставление фотографий треку прервано"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Настройка часового пояса и смещения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Выбранные фотографии не содержат информацию о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Фотографии не содержат информацию о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -10227,17 +10260,17 @@
 "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX трек не содержит информации о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Необходимо выбрать трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Трек GPX не выделен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10248,5 +10281,5 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10257,56 +10290,56 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извлечение GPS координат из EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Запуск сканирования каталога"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Один из выделенных файлов пуст"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Прочитать фотографии..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Чтение {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Не удалось получить канонический путь к каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Скнирование каталога {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Найден пустой файл в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Коррелируют с GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10315,22 +10348,22 @@
 msgstr[2] "изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} изображений имело теги GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10528,4 +10561,589 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Использовать глобальные настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Авторы"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Нажмите, чтобы прервать процесс объединения точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Канал"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Пароль"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Повернуть вправо"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Добавить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Авторы"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Пожалуйста, введите имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Пожалуйста, введите имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Сбой инициализации API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Доступ"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Дополнительные параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Введите выражение для поиска"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Пожалуйста, введите имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Пожалуйста, введите имя пользователя"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Нажмите, чтобы отменить текущую операцию"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Пожалуйста, выберите хотя бы одну точку или линию."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Не найдено совпадений для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Закрыть диалог и отменить скачивание"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Закрыть диалог и создать новую точку"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Выборка пакета точек из ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "Ошибка: не удается сохранить свойства для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, fuzzy, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr "Проверка перевода для языка ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Отсутствует нужный атрибут ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, fuzzy, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Загрузить источники стилей из ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Загрузить параметры"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Ссылка вышки"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Запросить обновление"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Версия <strong>{0}</strong> в настоящий момент отредактирована в слое "
+"''{1}''</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Ресторан"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Нажмите, чтобы удалить назначение"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Пункт вызова экстренной помощи"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Нажмите, чтобы удалить назначение"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Доступ"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Ошибка обновления"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Сервер OSM<br>''{0}''<br>сообщил о внутренней ошибке.<br>Похоже, это "
+"временная проблема. Пожалуйста, попробуйте позднее.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "строка;строка;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10557,5 +11175,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10563,5 +11181,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10569,7 +11187,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Пожалуйста, выберите ряд для удаления."
@@ -11037,14 +11655,4 @@
 msgstr "Данные OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Сохранять резервные копии"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"При сохранении, оставлять резервные копии файлов (в конце названия ставится "
-"~)"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -11083,17 +11691,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Оформление"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr "Идёт поиск доступных переводов..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "По умолчанию (Автоопределение)"
@@ -11160,10 +11763,20 @@
 msgstr "Настроить модуль сайтов"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Закрыть диалог и создать новую точку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Отменить обновления и закрыть диалог"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Настройки экрана"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11171,29 +11784,29 @@
 msgstr "Различные настройки, влияющие на внешний вид программы."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Параметры соединения"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Параметры соединения с сервером OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Настройки карты"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Параметры проекции карты и отображения данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Параметры Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Параметры звукового проигрывателя, и звуковых маркеров."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
@@ -11220,90 +11833,29 @@
 msgstr "Невозможно активировать проекцию {0}. Используется Меркатор"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Достопримечательность"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Параметры прокси-сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Основной адрес сервера OSM (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Логин (e-mail) учётной записи OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Основной адрес сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "Имя пользователя OSM (E-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM пароль"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек."
-"<br>Пароль передаётся на сервер открытым текстом, закодированный в URL."
-"<br><b>Не используйте важные Пароли.</b></html"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11604,4 +12156,258 @@
 msgstr "Группы модификаторов"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Ошибочная ссылка?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Невозможно установить соединение с удаленным сервером<br>''{0}''."
+"<br>Пожалуйста проверьте свое подключение к интернету.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Ошибка подключения."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Использовать значение по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Сохранять резервные копии"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr ""
+"При сохранении, оставлять резервные копии файлов (в конце названия ставится "
+"~)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "Имя пользователя OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM пароль"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек."
+"<br>Пароль передаётся на сервер открытым текстом, закодированный в URL."
+"<br><b>Не используйте важные Пароли.</b></html"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Основной адрес сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Проверить"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Текущее значение - по умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Пожалуйста, перезапустите JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11747,5 +12553,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11799,23 +12605,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11824,16 +12636,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11841,5 +12653,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11847,5 +12659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -12086,5 +12898,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -12132,5 +12944,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -12178,19 +12990,19 @@
 msgstr "OK - пробуем ещё раз."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Попытка {0} из {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "Текущий пакет правок пуст. Невозможно загрузить данные."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -12199,11 +13011,11 @@
 "идентификатором {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Код={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12371,4 +13183,21 @@
 msgstr "Анализ списка пакетов правок..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Предупреждение: неожиданное значение ключа ''{0}'' в параметрах, получено "
+"''{1}''"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12686,23 +13515,28 @@
 "соединение."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "Отсутствует тег XML <user>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Отсутствует атрибут ''{0}'' на теге XML ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Чтение пакета правок {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -13101,5 +13935,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -13110,5 +13944,5 @@
 "адрес сервера в настройках и соединение с интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -13121,5 +13955,5 @@
 "удалите ссылку на отношение {0}, затем снова загрузите на сервер.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -13132,5 +13966,30 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -13141,5 +14000,5 @@
 "он уже был закрыт.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -13150,5 +14009,5 @@
 "он уже был закрыт в {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -13159,9 +14018,9 @@
 "(англ.):<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Сервер сообщил, что обнаружен конфликт.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -13172,5 +14031,5 @@
 "как он уже был закрыт в {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -13183,5 +14042,5 @@
 "формы приложения ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -13192,5 +14051,5 @@
 "<br>Пожалуйста проверьте свое подключение к интернету.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -13201,5 +14060,5 @@
 "проблемы передачи данных.<br>Подробнее: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -13210,10 +14069,10 @@
 "временная проблема. Пожалуйста, попробуйте позднее.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Сервер OSM ''{0}'' сообщил о неудачном запросе.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -13225,10 +14084,10 @@
 "средствами экспорта файлов OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Сообщение об ошибке (на английском): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -13243,5 +14102,5 @@
 "Пожалуйста, внимательно проверьте адрес сервера ''{0}'' на предмет опечаток."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13254,5 +14113,5 @@
 "программы и ваше соединение с интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13267,18 +14126,5 @@
 "<br><br>Сообщение об ошибке:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr "Загрузка доступных языков..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr "Проверка языков..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr "Проверка перевода для языка ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13312,4 +14158,10 @@
 "Предупреждение: не удалось извлечь префикс языка вики из локального кода "
 "JOSM ''{0}''. Используется код по умолчанию ''en''."
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -13721,5 +14573,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Выбрать Feuille (слой??)"
@@ -13772,5 +14624,11 @@
 msgstr "CadastreGrabber: Не правильная ссылка"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13781,25 +14639,23 @@
 "или действие отменено"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Выбрать из..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Выберите коммуну"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Выбрать из..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Авто источники"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13811,13 +14667,13 @@
 "Вы хотите назначить на клавишу F11 функцию захвата?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Восстановить действие захватывающей клавиши F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM остановлено для того, чтобы проявились изменения."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13827,34 +14683,34 @@
 "было: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Заменить оригинальный фон JOSM на цвет фона."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Обратить серые цвета (для черного фона)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Установить прозрачный фон."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Нарисовать границы скачанных данных."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr "Отменить обрезку изображения во время геопривязки"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Включить автоматическое кеширование."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Макс. размер кеша (МБ)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13872,18 +14728,18 @@
 "данных, созданный этим модулем."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "WMS французского кадастра"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>Значение тега \"source\" когда включенs автоисточники</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Источник"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13892,5 +14748,5 @@
 "Заменить оригинальный белый фон на цвет фона, определенные в настройках JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13900,46 +14756,46 @@
 "Полезно для текстов на темном фоне."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Позволяет соединять несколько слоев"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Установить прозрачность слоев  WMS. С право непрозрачный, слева прозрачный."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Нарисовать прямоугольник вокруг данных, скачанных с сервера WMS."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr "Векторные изображения захватить мультипликатором:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Взять мелкие изображения (высокое качество, но использует больше памяти)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Фиксированный размер площади (по умолчанию 100 м)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Фиксированный размер (от 25 до 1000 метров)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr "Растровые изображения захватить мультипликатором:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr "Показать перекрестья:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен"
@@ -14059,5 +14915,5 @@
 "Вы хотите воспользоваться ими?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -14067,14 +14923,14 @@
 "(Требуется отметить две точки)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "Обрезать изображение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr "Отметьте второй угол для обрезки изображения"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -14084,14 +14940,14 @@
 "(Всего нужно две точки)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr "Геопривязка изображения"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr "Отметьте вторую поперечину Lambert для геопривязки"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -14101,21 +14957,21 @@
 "или только попытаться снова "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "Ввести кадастровую позицию восток,север"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr "Предупреждение: проверьте север с помощью стрелки !!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Восток"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Север"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -14233,28 +15089,28 @@
 msgstr "Пустой слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "слой WMS ({0}), квадратов загружено: {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Не векторизованны."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Размер растра: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Векторизован."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -14265,47 +15121,47 @@
 "Создайте новый файл."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Ошибка формата кеша"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Ошибка кеширования зоны Ламберта"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Использовать"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Выберите тему для использования."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Цветовая схема"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Выберите тему для удаления."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Использовать выбранную тему из списка."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Использовать текущие цвета как новую цветовую тему."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Удалить выбранную тему из списка."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Цветовые схемы"
@@ -14470,6 +15326,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Обновить"
@@ -14699,33 +15555,33 @@
 msgstr "Произошла неизвестная ошибка"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "восток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "северо-восток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "север"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "северо-запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "юго-запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "юг"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "юго-восток"
@@ -14765,5 +15621,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14774,81 +15630,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "вода"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "береговая линия"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "земля"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Максимальное количество сегментов в линии"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Максимальное количество точек на начальном треке"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Самый светлый оттенок серого, который считать водой (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Точность упрощения линий (в градусах)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Разрешение в квадратах спутниковых снимков (пикселей на градус)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Размер квадратов спутниковых снимков (точек)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Сдвинуть все треки на восток (градусы)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Сдвинуть все треки на север (градусы)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Направление для поиска места"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Назначить на линии теги:"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Слой WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Размер кэша (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Хранить кэш (дней)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Исходный текст"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Максимальное количество сегментов в создаваемых линиях. По умолчанию - 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14858,5 +15714,5 @@
 "линий). По умолчанию 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14866,5 +15722,5 @@
 "Лэндсат IR-1). Может быть в диапазоне 0-255. Стандартное значение 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14875,5 +15731,5 @@
 "умолчанию 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14882,24 +15738,24 @@
 "- 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 "Размер одного квадрата спутникового снимка, в пикселях. По умолчанию 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 "Сдвинуть все точки в восточном направлении (в градусах). По умолчанию 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 "Сдвинуть все точки в северном направлении (в градусах). По умолчанию 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Направление поиска земли. По умолчанию — восток."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14907,25 +15763,25 @@
 "ничего. По умолчанию - вода."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Какой слой WMS использовать для трасировки. По умолчанию IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Макс. размер каждого каталога с кэшем, байт (по умолчанию 300 МБ)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Макс. возраст файлов в кэше (по умолчанию 100 дней)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Данные исходного текста. По умолчанию Лэндсат."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Модуль для трасировки водоемов по изображениям Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Настройки модуля Lakewalker"
@@ -15138,5 +15994,5 @@
 msgstr "Цикл скачивания из OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Отображает проблемы из OpenStreetBugs"
@@ -15166,5 +16022,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -15181,14 +16036,22 @@
 "строкой."
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Открытые OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Открывает окно OpenStreetBugs и активирует автоматическое скачивание"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -15197,22 +16060,32 @@
 "Видимая область слишком мала/велика для скачивания данных из OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+#, fuzzy
+msgid "Queue"
+msgstr "Запрос"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Добавить комментарий"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Введите Ваш комментарий"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Комментарий"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Отметить \"сделано\""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Действительно закрыть?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -15222,23 +16095,51 @@
 "добавить комментарий:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Закрыть"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Новая проблема"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Указать новую проблему"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Опишите проблему как можно подробнее"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Создано"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Пожалуйста, введите имя пользователя"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Неизвестный статус проблемы"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Открытые OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15260,10 +16161,10 @@
 msgstr "Неизвестное расширение файла: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -15273,5 +16174,5 @@
 "Настройки карты в окне настроек."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "исполняемый файл Firefox"
@@ -15281,37 +16182,37 @@
 msgstr "PicLayer"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "загрузить данные из API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "создать новые объекты"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "изменить выделение"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "изменить область просмотра на экране"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "подтверждать все действия удалённого управления вручную."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Модуль, позволяющий другим приложениям управлять JOSM"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Дистанционное управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Настройки модуля дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15323,5 +16224,5 @@
 "подключающихся к модулю."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Разрешённые действия"
@@ -15438,25 +16339,25 @@
 msgstr "Очистить маршрут"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Настройки модуля маршрутизации"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Настройка предпочтений маршрутизации."
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Тип автомобильной дороги"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Скорость (км/ч)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Толщина"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Введите значение толщины"
@@ -15502,42 +16403,42 @@
 msgstr "изображение "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "Автомасштабирование"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "автозагрузка квадратов карты"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "ПростаяКарта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Настройки модуля SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Источник квадратов карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Авто приближение: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Автозагружаемые квадраты карты: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr "Уровень мин. приближения: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Уровень макс. приближения: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Бледный фон: "
@@ -15775,37 +16676,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Использовать список игнорирования"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Использовать список игнорирования для подавления предупреждений"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Использовать слой ошибок"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Использовать слой ошибок для отображения проблемных областей"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Показать информационный уровень при загрузке на сервер."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Показать информационное тесты в окнах проверки загрузки на сервер"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "По требованию"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "При загрузке на сервер"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15815,5 +16716,5 @@
 "и программами."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Проверка данных"
@@ -16432,5 +17333,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "здание"
@@ -16444,5 +17345,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "полигон"
@@ -16869,55 +17770,55 @@
 msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Настройки модуля WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Название меню"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "Ссылка на WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Имя пункта меню (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (по умолчанию)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Введите имя пункта меню и URL этого WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Скопировать выделенное по умолчанию"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Пожалуйста, выберите, хотя бы одну строчку для копирования."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Средство скачивания:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Накладывающиеся квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "% восточнее:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "% севернее:"
@@ -18502,6 +19403,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "проезжая часть"
@@ -18527,6 +19428,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
@@ -18552,6 +19453,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "главная дорога"
@@ -18577,6 +19478,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "второстепенная дорога"
@@ -18590,5 +19491,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "дорога третьего порядка"
@@ -18606,5 +19507,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "дорога местного значения"
@@ -18638,6 +19539,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "служебный проезд"
@@ -18671,6 +19572,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "строящаяся дорога"
@@ -18720,5 +19621,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "Круг"
@@ -19704,5 +20605,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "Болото"
@@ -21102,7 +22003,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "улица"
@@ -21830,28 +22731,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "спорт"
@@ -23546,4 +24447,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23578,9 +24487,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "зеленый"
@@ -24988,7 +25897,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "велосипедный"
@@ -25058,7 +25967,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "пеший"
@@ -25084,5 +25993,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "линия метро"
@@ -25378,5 +26287,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "уменьшать"
@@ -25418,5 +26327,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "лошадь"
@@ -25526,4 +26435,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25561,5 +26476,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25632,11 +26547,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "ограждение"
@@ -25699,5 +26614,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "дорога для легковых автомобилей"
@@ -25753,7 +26668,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "трек автодороги"
@@ -25824,9 +26739,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "железная дорога"
@@ -25918,5 +26833,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "услуги"
@@ -25930,5 +26845,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "брод"
@@ -25949,10 +26864,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "кольцо"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25962,5 +26877,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "пункт_неотложной_помощи"
@@ -25975,5 +26890,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "берег реки"
@@ -25987,5 +26902,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "поток"
@@ -25999,5 +26914,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "док"
@@ -26186,13 +27101,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "искусственный"
@@ -26254,7 +27169,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "ж/д точка"
@@ -26277,10 +27192,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "другая жд дорога"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "жд дорога сверху"
@@ -26316,7 +27231,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "Старая жд дорога"
@@ -26362,6 +27277,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "воздушная трасса"
@@ -26375,5 +27290,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "пассажирский терминал"
@@ -26395,5 +27310,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "тёмная воздушная трасса"
@@ -26407,5 +27322,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "светлая воздушная трасса"
@@ -26467,7 +27382,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "канатная дорога"
@@ -26484,5 +27399,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "легкая трасси"
@@ -26497,5 +27412,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "промежуточная трасса"
@@ -26510,5 +27425,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "продвинутая трасса"
@@ -26523,5 +27438,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "специалист лыжной трассы"
@@ -26536,5 +27451,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "бесплатная трасса"
@@ -26549,5 +27464,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "трасса для новичков"
@@ -26667,11 +27582,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "энергия"
@@ -26685,5 +27600,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "плотина"
@@ -26697,5 +27612,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "трубопровод"
@@ -26839,13 +27754,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "свободное время"
@@ -26859,5 +27774,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "гавань"
@@ -26953,10 +27868,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "использование"
@@ -27058,14 +27973,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "режим использования"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27461,5 +28383,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27484,23 +28406,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "легкое использование"
@@ -27532,6 +28454,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "прозрачная_вода"
@@ -27592,8 +28514,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "здоровье"
@@ -27946,26 +28868,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "магазин"
@@ -28037,8 +28959,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "отель"
@@ -28109,5 +29031,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28116,5 +29038,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -28124,5 +29046,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28131,5 +29053,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -28139,9 +29061,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "туристический"
@@ -28229,14 +29151,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "исторический"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28245,5 +29166,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "карьер"
@@ -28257,5 +29178,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -28277,5 +29198,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "водоём"
@@ -28289,5 +29210,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "лес"
@@ -28301,5 +29222,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "двор фермы"
@@ -28322,5 +29243,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "розничная продажа"
@@ -28334,5 +29255,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "промышленный"
@@ -28346,5 +29267,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -28358,5 +29279,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -28370,5 +29291,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "жд разъезд"
@@ -28425,7 +29346,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "военный"
@@ -28439,5 +29360,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "кладбище"
@@ -28450,5 +29371,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "пик"
@@ -28463,5 +29384,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "ледник"
@@ -28475,5 +29396,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "вулкан"
@@ -28528,8 +29449,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "природный"
@@ -28543,5 +29464,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "кустарник"
@@ -28555,5 +29476,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "здоровье"
@@ -28567,5 +29488,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "лес"
@@ -28579,5 +29500,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "грязь"
@@ -28591,5 +29512,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "пляж"
@@ -28667,8 +29588,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "маршрут"
@@ -28691,4 +29612,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28716,7 +29678,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "граница"
@@ -28866,11 +29833,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "место"
@@ -28918,6 +29885,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "адрес"
@@ -29274,4 +30241,27 @@
 msgstr "Sicily - Италия"
 
+#~ msgid "Looking up available translations..."
+#~ msgstr "Идёт поиск доступных переводов..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Основной адрес сервера OSM (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Логин (e-mail) учётной записи OSM"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "Имя пользователя OSM (E-mail)"
+
+#~ msgid "Loading available locales..."
+#~ msgstr "Загрузка доступных языков..."
+
+#~ msgid "Checking locales..."
+#~ msgstr "Проверка языков..."
+
 #~ msgid "No data imported."
 #~ msgstr "Данные не импортированы"
@@ -29555,7 +30545,4 @@
 #~ msgid "zoom"
 #~ msgstr "масштаб"
-
-#~ msgid "Validate"
-#~ msgstr "Проверить"
 
 #~ msgid "Adjust the position of the WMS layer"
@@ -29735,7 +30722,4 @@
 #~ msgstr "Невозможно прочесть дату из файла \"{0}\""
 
-#~ msgid "OSM username (email)"
-#~ msgstr "Имя пользователя OSM (e-mail)"
-
 #~ msgid "Enable proxy server"
 #~ msgstr "Использовать прокси-сервер"
@@ -29827,7 +30811,4 @@
 #~ msgid "Public"
 #~ msgstr "Публичный"
-
-#~ msgid "Request Update"
-#~ msgstr "Запросить обновление"
 
 #~ msgid "error requesting update"
@@ -30146,7 +31127,4 @@
 #~ msgstr "Прошущен примитив"
 
-#~ msgid "Update failed"
-#~ msgstr "Ошибка обновления"
-
 #~ msgid "Selection too big"
 #~ msgstr "Выборка слишком большая"
@@ -30187,7 +31165,4 @@
 #~ msgid "relations"
 #~ msgstr "отношения"
-
-#~ msgid "API initialization failed"
-#~ msgstr "Сбой инициализации API"
 
 #~ msgid ""
@@ -30696,4 +31671,7 @@
 #~ "ожидания.</html>"
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Текущий пакет правок пуст. Невозможно загрузить данные."
+
 #~ msgid ""
 #~ "Plugin {0} version {1} found but for this version of JOSM is at least "
@@ -30737,4 +31715,7 @@
 #~ "будет на месте оригинальной точки отношения.</html>"
 
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr "Не удалось загрузить ресурс ''{0}''. Ошибка: {1}"
+
 #~ msgid ""
 #~ "<html>The combined ways are members in one ore more relations. Please "
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 19246)
+++ applications/editors/josm/i18n/po/sk.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,7 +12,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-27 22:16+0000\n"
-"Last-Translator: marin <Unknown>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:01+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:22+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -300,4 +300,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Pokračovanie"
@@ -328,5 +329,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -342,7 +343,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -476,6 +480,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -554,5 +559,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -566,5 +571,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informácia"
@@ -763,15 +768,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Odstrániť"
@@ -849,6 +854,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1503,14 +1508,15 @@
 msgstr[2] "až {0} pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Nastavenia..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Otvoriť globálne nastavenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Nastavenia"
@@ -1657,17 +1663,17 @@
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Správa o stave"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopírovať do schránky a zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1818,34 +1824,34 @@
 msgstr "Tento bod nie je prilepený k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Žiaden z týchto bodov nie je prilepený k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tento výber sa nedá použiť pre oddelenie bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Jeden označený bod, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden bod používaný viac než jednou cestou, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1854,5 +1860,5 @@
 "ceste, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1861,5 +1867,5 @@
 "ceste."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1872,9 +1878,9 @@
 "svoje vlastné kópie a všetky bodybudú vybraté."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Nepripojený bod (Unglued Node)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1882,5 +1888,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2047,4 +2053,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Späť"
@@ -3316,24 +3324,24 @@
 "záložiek ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Predvoľby uložené na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Nemôžem nahrať predvoľby zo servera."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3344,5 +3352,5 @@
 "záložiek zo servera"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3355,6 +3363,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr "Nesprávne načítanie čítacieho prostriedku ''{0}''. Chyba je {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3781,6 +3789,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3949,5 +3957,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3962,10 +3970,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "komunikácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3973,15 +3981,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vodný tok"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "využitie oblasti (landuse)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3995,6 +4003,11 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Hromadná doprava"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -4004,5 +4017,5 @@
 msgstr[2] "{0} členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4044,9 +4057,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Spojenie zlyhalo"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Spojenie zlyhalo"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Neznámy hostiteľ"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "Objekt je vymazaný"
@@ -4153,65 +4176,65 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otvoriť súbor (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Nastaviť jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "Zmena adresára  pre všetký nastavenia užívateľa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4223,9 +4246,9 @@
 "      Java nastavenie využitia na maximálnu mieru pridelenej pamäti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4236,25 +4259,25 @@
 "nejaké dáta predtým--výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namiesto --download=<bbox> môžete zadať osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktivujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4267,5 +4290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4274,5 +4297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4382,5 +4405,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "Používateľ:"
@@ -5084,5 +5107,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5097,5 +5120,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -5103,5 +5126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5191,5 +5214,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "žiadny"
@@ -5377,5 +5400,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5387,5 +5410,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5482,5 +5505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5489,5 +5512,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5577,13 +5600,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Pridať"
@@ -5714,54 +5737,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Otvoríť zoznam všetkých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Otvoriť editor pre zvolenú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Zmazať vybraté relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Vytvoriť novú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "Pridať aktuálny výber do zoznamu vybratých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "Výber členov zo všetkých vybraných relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "Výber členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "Stiahnutie všetkých členov z vybraných relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "Stiahnuť členov"
@@ -7101,58 +7124,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -7160,58 +7183,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7219,9 +7242,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7229,5 +7252,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7235,15 +7258,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7251,9 +7274,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7262,5 +7285,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7287,9 +7310,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Základný"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7299,5 +7323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7308,5 +7332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7348,22 +7372,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7373,10 +7399,10 @@
 msgstr[2] "Toto chce zmeniť {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr "Prázdna hodnota vymaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7385,10 +7411,10 @@
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7398,5 +7424,5 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7406,9 +7432,9 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
@@ -7436,61 +7462,57 @@
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Zmazať {0} relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Nie je vybraná žiadna relácia"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Výber nastavenia kreslenej čiary"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Výber nastavenia kreslenej čiary"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7547,5 +7569,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7559,11 +7581,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr "Sťahovanie relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}: Sťahovanie relácie ''{2}''..."
 
@@ -8211,6 +8233,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9318,6 +9341,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9411,9 +9434,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9435,4 +9457,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9904,24 +9933,24 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Súbory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba pri rozkladaní {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemôžem čítať \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9933,34 +9962,34 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "GPS čas (čítaj nad fotografiou) "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Som v časovej zóne: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Žiaden dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Otvoriť inú fotografiu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronizovať čas z fotky a GPS prímača"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9970,114 +9999,116 @@
 "Prosím použite požadovaný formát."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Neplatný dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Nie je zatiaľ nahratá GPX stopa (track)>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX stopa(trasa): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Otvoriť inú GPX stopu(trasu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Vyrovnať(Offset):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Zladiť obrázky s GPX stopou(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Zladiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Neplatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Neplatné vyrovnanie (offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časové pásmo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minút: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekúnd: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10087,38 +10118,38 @@
 "posúvač ručne na fotky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Nastaviť časové pásmo a vyváženie(offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "Vybraté fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX Stopa nemá informáciu o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Môžete vybrať GPX stopu(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Nevybratá GPX stopa(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -10129,5 +10160,5 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -10138,56 +10169,56 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Získavam GPS polohu z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Začínam prehľadávať adresár"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr "Niektorý z vybratých súborov bol prázdny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Čítať fotky..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čítam {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemôžem získať cestu pre adresár {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prehľadávam adresár {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -10196,22 +10227,22 @@
 msgstr[2] "obrázkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} boli nájdené s gps značkami."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10410,4 +10441,589 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Použíť globálne nastavenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Autori (spracovatelia)"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Kliknúť pre zrušenie spojovania bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Prieplav"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Meno používateľa"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Heslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Otočiť vpravo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Pridať vlastnosti"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Autori (spracovatelia)"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Zadajte uživateľské meno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Prosím vložte uživateľské meno vášho OSM konta"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "API inicializácia neúspešná"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Prístup"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Pokročilé voľby"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "Vložte hľadaný výraz"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Zadajte uživateľské meno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Zadajte uživateľské meno"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "Kliknutím zrušíte aktuálnu operáciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Prosím vyberte aspoň jeden bod, alebo cestu."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Neboli nájdené záznamy pre \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Zavrieť dialóg a zrušiť sťahovanie"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Zatvorte dialóg a vytvorte nový bod"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, fuzzy, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Priniesť(Fetching) balíček bodov z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, fuzzy, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr "Kontrolujem preklady pre lokality ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, fuzzy, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr "Chýba povinná vlastnosť ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, fuzzy, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Vložiť zdroje štýlov z ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Nahrať nastavenie"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+#, fuzzy
+msgid "Allow to write your preferences"
+msgstr "Nastavenie veže"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Žiadosť na aktualizáciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Verzia <strong>{0}</strong> aktuálne upravovaná vo vrstve ''{1}''</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Reštaurácia"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "Kliknutie odstráni miesto určenia"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Pohotovosť (Záchranná služba)"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "Kliknutie odstráni miesto určenia"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Prístup"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Aktualizácia neúspešná"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+#, fuzzy
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>OSM server<br>''{0}''<br>hlási vnútornú chybu serveru.<br>Toto je "
+"veľmi pravdepodobne dočasný problém. Prosím skúste znovu neskôr.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "reťazec;reťazec;..."
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10439,5 +11055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10445,5 +11061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10451,7 +11067,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Prosím vyberte riadok na odstránenie."
@@ -10914,12 +11530,4 @@
 msgstr "OSM údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Ponechávať záložné súbory"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Pri ukladaní zanechávať záložné súbory končiace znakom ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10958,17 +11566,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Vzhľad a chovanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr "Vyhľadávanie dostupných prekladov..."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Štandardný (Automatická predvoľba)"
@@ -11035,10 +11638,20 @@
 msgstr "Konfigurovať umiestnenie pluginov"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Zatvorte dialóg a vytvorte nový bod"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Nastavenie zobrazenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11046,29 +11659,29 @@
 msgstr "Rôzne nastavenia ovplyvňujúce vzhľad celého programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavenie pripojenia pre OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Nastavenie mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Nastavenie projekcie mapy a interpretácie dát."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Nastavenia zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Nastavenia pre zvukový prehrávač a zvukové značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM."
@@ -11095,91 +11708,29 @@
 msgstr "Projekcia {0} nemohla byť aktivovaná. Bude použitá projecia Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Atrakcia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Nastavenia proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Základná URL pre OSM server (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Základná Serverová URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM užívateľské meno (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM heslo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
-"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
-"<br><b>Nepoužite vzácne Heslo.</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11479,4 +12030,256 @@
 msgstr "Skupiny modifikátorov"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+#, fuzzy
+msgid "Invalid API URL"
+msgstr "Chybná URL?"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
+"<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Spojenie zlyhalo."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Použíť východzie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Ponechávať záložné súbory"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Pri ukladaní zanechávať záložné súbory končiace znakom ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM používateľské meno (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM heslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
+"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
+"<br><b>Nepoužite vzácne Heslo.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Nastavenia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Základná Serverová URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Overiť"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Súčasná hodnota je východzia"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "Prosím reštartujte JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11622,5 +12425,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11674,23 +12477,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11699,16 +12508,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11716,5 +12525,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11722,5 +12531,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11962,5 +12771,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -12009,5 +12818,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -12055,30 +12864,30 @@
 msgstr "OK - skúšam znovu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Spúšťam opakovanie {0} z {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr "Otvoriť očakávaný zmenový súbor. Got zavretý zmenový súbor s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr "(Kód={0})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -12245,4 +13054,20 @@
 msgstr "rozkladám obsah zo zmenového súboru..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12557,24 +13382,29 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr "XML značka(tag) <user> chýba"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr "Chýbajúca vlastnosť ''{0}'' na XML značke(tag) ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
 "Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Načitávam zmenový súbor {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12973,5 +13803,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12983,5 +13813,5 @@
 "pripojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12994,5 +13824,5 @@
 "odkaz z relácie {0}, a nahrajte znovu.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -13005,5 +13835,30 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -13014,5 +13869,5 @@
 "uzavretý.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -13023,5 +13878,5 @@
 "už bol zavretý na {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -13032,9 +13887,9 @@
 "(nepreložená):<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Server poslal správu, že objavil konflikt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -13045,5 +13900,5 @@
 "zavretý pri {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -13057,5 +13912,5 @@
 "applet z ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -13066,5 +13921,5 @@
 "<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -13075,5 +13930,5 @@
 "problém pri prenose dát.<br>Detaily (nepreložené): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -13084,10 +13939,10 @@
 "veľmi pravdepodobne dočasný problém. Prosím skúste znovu neskôr.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "OSM server ''{0}'' hlási zlý príkaz.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -13099,10 +13954,10 @@
 "súbor poskytnutý OSM komunitou."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Chybná správa(nepreložený): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -13117,5 +13972,5 @@
 "serverov ''{0}'' kvôli preklepom."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -13128,5 +13983,5 @@
 "URL vo vašich nastaveniach a vaše internetové pripojenie.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -13141,18 +13996,5 @@
 "<br><br>Chybová správa je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr "Nahrávam dostupné likality..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr "Kontrolujem lokality..."
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr "Kontrolujem preklady pre lokality ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -13186,4 +14028,10 @@
 "Varovanie: neúspešne odvodený wiki jazyk z JOSM miestneho kódu ''{0}''. "
 "Použitý východzí kód ''en''."
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -13589,5 +14437,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr "Vybrať Feuille"
@@ -13640,5 +14488,11 @@
 msgstr "CadastreGrabber: Nedovolená url."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13649,25 +14503,23 @@
 "alebo ja akcia zrušená"
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Vybrať z..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Vybrať hranice obce(samosprávy)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Vybrať z..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13679,13 +14531,13 @@
 "Budete si želať obnoviť F11 pre grabovanie?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "Obnoviť klávesovú skratku pre grabovanie F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13695,35 +14547,35 @@
 "boli: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Nahradiť pôvodné pozadie farbou JOSM pozadia."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Opačná šedá farba (pre čierne pozadia)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Nastaviť priehľadné pozadie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Kresliť okraje okolo stiahnutých dát."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 "Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Povoliť automatické cachovanie."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Maximálna veľkost cache (v MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13740,18 +14592,18 @@
 "<BR>predtým, ako nahráte nejaké dáta vytvorené  týmto pluginom."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "French cadastre WMS (Francúzsky kataster WMS)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13761,5 +14613,5 @@
 "JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13769,45 +14621,45 @@
 "pre texty na tmavých pozadiach."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "Povoliť vyrovnanie viacnásobných vrstiev"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr "Nastaviť priehľadnosť WMS vrstiev"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr "Zachytávač vektorových obrázkov multiplikátor:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "Pevná veľkosť štvorcov (východzia 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr "Zachytávač rastrových obrázkov multiplikátor:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená"
@@ -13927,5 +14779,5 @@
 "Chcete ich použiť?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13935,14 +14787,14 @@
 "(povinné sú dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr "Orezávanie obrázkov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr "Kliknite na druhý roh pre orezanie obrázka"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13952,10 +14804,10 @@
 "(povinné sú dva body)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr "Určovanie zemepisnej polohy obrázkov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
@@ -13963,5 +14815,5 @@
 "(georeferencing)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13971,21 +14823,21 @@
 "alebo len opakovať "
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr "Vstúpiť do cadastre na východ, sever pozícii"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr "(Varovanie: potvrdte sever so šípkou !!)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "Východ"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "Sever"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -14103,28 +14955,28 @@
 msgstr "Prázdna vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), {1} dlaždice(dlaždíc) načítané"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Nie je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Veľkosť rastra: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Hranice obce bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -14135,9 +14987,9 @@
 "Vytvorte nový súbor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Cache chýb formátov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -14146,38 +14998,38 @@
 "Lambertova zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "Cache chýb v Lambert Zóne"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Použiť"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Prisím vyberte schému k použitiu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Farebná schéma"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Vyberte schému pre zmazanie."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Použiť vybratú schému zo zoznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Použiť súčasné farby ako novú farebnú schému."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Zmazať vybranú schému zo zoznamu."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Farebná schéma"
@@ -14341,6 +15193,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Obnoviť"
@@ -14570,33 +15422,33 @@
 msgstr "Nastala neznáma chyba"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "východ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "severovýchod"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "sever"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "severozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "západ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "juhozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "juh"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "juhovýchod"
@@ -14636,5 +15488,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14645,81 +15497,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "voda"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "pobrežie"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "zem"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Maximálny počet úsekov na cestu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximálny počet bodov v prvotnom trasovaní"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximálna hodnota šedej braná ako voda (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Presnosť zjednodušovania čiar (stupňov)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Rozlíšenie dlaždíc Landsatu (pixely na stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Veľkosť dlaždíc Landsatu (pixely)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Posunúť všetky stopy(traces) na východ (stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Posunúť všetky stopy(traces) na sever (stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Smer hľadania zeme"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Značky ciest ako"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS Vrstva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Maximálna veľkosť cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Maximálny vek cache (dni)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Zdrojový text"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14729,5 +15581,5 @@
 "Štandardne 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14737,5 +15589,5 @@
 "Môže byť v rozsahu 0-255. Štandardne 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14746,5 +15598,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14752,29 +15604,29 @@
 "Rozlíšenie Landsat dlaždíc, merané v pixeloch na stupeň. Štandardne 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Veľkosť jednej Landsat dlaždice, meraná v pixeloch. Štandardne 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Vyrovnanie všetkých bodov vo Východnom smere(stupne). Štandardne 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Vyrovnanie všetkých bodov v Severnom smere(stupne). Štandardne 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Smer hľadania zeme. Štandardne východ."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Značky ciest, ako voda, pobrežie, zem alebo nič. Štandardne voda."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Ktorú WMS vrstvu použiť pre trasovanie. Štandardne je IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
@@ -14782,18 +15634,18 @@
 "hodnota je 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximálny vek jednotlivých súborov v cache v dňoch. Štandardná hodnota je 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Zdrojový text. Štandardne je Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Pluginy pre trasovanie vodných plôch z fotografií Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Nastavenie pluginu Lakewalker"
@@ -15004,5 +15856,5 @@
 msgstr "OpenStreetBugs sťahovaná slučka"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -15032,5 +15884,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -15046,14 +15897,22 @@
 "Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Otvoriť OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "Otvoriť OpenStreetBugs okno a aktivovať automatické sťahovanie"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -15063,22 +15922,31 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Pridať komentár"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Zadajte váš komentár"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Spoločné, obecné"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Označiť ako hotové"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Naozaj uzavrieť?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -15088,23 +15956,51 @@
 "nejakú nepovinnú poznámku:</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Zavrieť"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nový problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Vytvoriť problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Podrobne popíšte problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Vytvorené v:"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Zadajte uživateľské meno"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Neznámy stav problému"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Otvoriť OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15126,10 +16022,10 @@
 msgstr "Neznámy typ súboru: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -15138,5 +16034,5 @@
 "Firefox sa nenašiel. Prosím nastavte spúšťací .exe súbor v nastaveniach."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Spúšťací súbor Firefoxu"
@@ -15146,37 +16042,37 @@
 msgstr "PicLayer"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "nahrať dáta z API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr "vytvoriť nové objekty"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "zmena výberu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "zmena pohľadu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrdzovať všetky požiadavky Vzdialenej kontroly ručne"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňujúci ovládanie JOSM z iných aplikácií."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Vzdialené ovládanie"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavenie pre plugin \"Remote Control\" Vzdialené ovládanie."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -15188,5 +16084,5 @@
 "využívajúce tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Povolené činnosti"
@@ -15300,25 +16196,25 @@
 msgstr "Vymazať trasu"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Nastavenia trasového (Routing) Pluginu"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Konfigurácia trasových priorít."
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Typ komunikácie"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Rýchlosť (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Hmotnosť"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Vstup hmotnostnej hodnoty"
@@ -15364,42 +16260,42 @@
 msgstr "obrázok "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "automatické zväčšenie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "automatické nahratie dlaždíc"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Nastavenia pre SlippyMap plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Zdroje Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Automatické zväčšenie: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Automatické nahratie Dlaždíc: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Max zväčšenie lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Vyblednúť pozadie: "
@@ -15636,9 +16532,9 @@
 "{1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Použiť zoznam nekontrolovaných chýb."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
@@ -15646,29 +16542,29 @@
 "(varovaní)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Použitie vrstvy chýb."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Použitie vrstvy chýb pre zobrazenie problematických elementov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "Zobraziť informačnú úroveň(level) pri nahrávaní."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "Zobraziť informačné testy v nahrávacom kontrolnom okne"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "Na požiadanie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Pri nahrávaní"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15678,5 +16574,5 @@
 "programami."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Overovanie dát"
@@ -16291,5 +17187,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "budova"
@@ -16303,5 +17199,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "oblasť (plocha)"
@@ -16714,55 +17610,55 @@
 msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Nastavenie WMS Pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Meno v menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Meno v menu (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL (východzie)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadajte meno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr "Kopírovať vybrané vychodzie nastavenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr "Prisím vyberte aspoň jeden riadok pre kopírovanie."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "Stahovač:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "Prekryť štvorce (tiles)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr "% z východu:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr "% zo severu:"
@@ -18343,6 +19239,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "dialnica (motorway)"
@@ -18368,6 +19264,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
@@ -18393,6 +19289,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "cesta prvej triedy"
@@ -18418,6 +19314,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "cesta druhej triedy"
@@ -18431,5 +19327,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "cesta tretej triedy"
@@ -18447,5 +19343,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -18479,6 +19375,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "obslužná (service)"
@@ -18512,6 +19408,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "konštrukcia"
@@ -18561,5 +19457,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -19552,5 +20448,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "močiar (marsh)"
@@ -20950,7 +21846,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "pouličná sieť"
@@ -21678,28 +22574,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "šport"
@@ -23398,4 +24294,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -23430,9 +24334,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "zelená"
@@ -24841,7 +25745,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "bicykel"
@@ -24911,7 +25815,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "pešia (foot)"
@@ -24937,5 +25841,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro (subway)"
@@ -25231,5 +26135,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "zastaralý"
@@ -25271,5 +26175,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "koňská (horse)"
@@ -25379,4 +26283,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -25414,5 +26324,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -25485,11 +26395,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr "prekážka"
@@ -25552,5 +26462,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr "cesta pre motorové vozidlá"
@@ -25606,7 +26516,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "cesta (highway_track)"
@@ -25677,9 +26587,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "koľajnica (rail)"
@@ -25771,5 +26681,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr "služby"
@@ -25783,5 +26693,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr "brod"
@@ -25802,10 +26712,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25815,5 +26725,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr "miesto pohotovostnej prvej pomoci"
@@ -25828,5 +26738,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "riečny breh"
@@ -25840,5 +26750,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "potok"
@@ -25852,5 +26762,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "dok (nakladacia rampa)"
@@ -26039,13 +26949,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -26107,7 +27017,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "železničná výhybka"
@@ -26130,10 +27040,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "iná koľaj"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -26169,7 +27079,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "historická železnica(turistická)"
@@ -26215,6 +27125,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "letecké cesty"
@@ -26228,5 +27138,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminál"
@@ -26248,5 +27158,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "zjazdovka_čierna"
@@ -26260,5 +27170,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "zjazdovka_ľahká"
@@ -26320,7 +27230,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "Visuté cesty/Lanovky"
@@ -26337,5 +27247,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "mierna zjazdovka (piste_easy)"
@@ -26350,5 +27260,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "stredne ťažká zjazdovka (piste_intermediate)"
@@ -26363,5 +27273,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "zjazdovka pre pokročilých (piste_advanced)"
@@ -26376,5 +27286,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr "zjazdovka pre expertov (piste_expert)"
@@ -26389,5 +27299,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "zjazdovka pre freeride (piste_freeride)"
@@ -26402,5 +27312,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "zjazdovka pre začiatočníkov (piste_novice)"
@@ -26520,11 +27430,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "energia (power)"
@@ -26538,5 +27448,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -26550,5 +27460,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -26692,13 +27602,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -26712,5 +27622,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "prístav (marina)"
@@ -26806,10 +27716,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -26911,14 +27821,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27314,5 +28231,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27337,23 +28254,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -27385,6 +28302,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -27445,8 +28362,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "zdravie"
@@ -27799,26 +28716,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "obchod"
@@ -27890,8 +28807,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27962,5 +28879,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27969,5 +28886,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27977,5 +28894,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27984,5 +28901,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27992,9 +28909,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "cestovanie"
@@ -28082,14 +28999,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historické"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -28098,5 +29014,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "lom"
@@ -28110,5 +29026,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -28130,5 +29046,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -28142,5 +29058,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "les"
@@ -28154,5 +29070,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "farmy"
@@ -28175,5 +29091,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "maloobchody"
@@ -28187,5 +29103,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "závody"
@@ -28199,5 +29115,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -28211,5 +29127,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -28223,5 +29139,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "železničný pozemok"
@@ -28278,7 +29194,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "armáda"
@@ -28292,5 +29208,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -28303,5 +29219,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -28316,5 +29232,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -28328,5 +29244,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "sopka"
@@ -28381,8 +29297,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -28396,5 +29312,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -28408,5 +29324,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "vresovisko"
@@ -28420,5 +29336,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr "zalesnená oblasť (woodarea)"
@@ -28432,5 +29348,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "blato (mud)"
@@ -28444,5 +29360,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "pláž (beach)"
@@ -28520,8 +29436,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "trasa (route)"
@@ -28544,4 +29460,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28569,7 +29526,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -28719,11 +29681,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "miesto"
@@ -28771,6 +29733,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adresa"
@@ -29126,4 +30088,28 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Looking up available translations..."
+#~ msgstr "Vyhľadávanie dostupných prekladov..."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Základná URL pre OSM server (REST API)"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo "
+#~ "ukladať."
+
+#~ msgid "OSM username (e-mail)"
+#~ msgstr "OSM užívateľské meno (e-mail)"
+
+#~ msgid "Loading available locales..."
+#~ msgstr "Nahrávam dostupné likality..."
+
+#~ msgid "Checking locales..."
+#~ msgstr "Kontrolujem lokality..."
+
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -29429,7 +30415,4 @@
 #~ msgstr "Importovať TCX súbor..."
 
-#~ msgid "Request Update"
-#~ msgstr "Žiadosť na aktualizáciu"
-
 #~ msgid "Show Tile Status"
 #~ msgstr "Zobraziť Stav Dlaždíc"
@@ -29494,7 +30477,4 @@
 #~ msgid "zoom"
 #~ msgstr "zväčšenie"
-
-#~ msgid "Validate"
-#~ msgstr "Overiť"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -30047,7 +31027,4 @@
 #~ msgstr "Pripája sa na OSM server..."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM používateľské meno (email)"
-
 #~ msgid "Version number missing from OSM data"
 #~ msgstr "Chýba číslo verzie z OSM údajov"
@@ -30104,7 +31081,4 @@
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizácia neúspešná"
 
 #~ msgid ""
@@ -30252,7 +31226,4 @@
 #~ "{0}, maximálne je {1}"
 
-#~ msgid "API initialization failed"
-#~ msgstr "API inicializácia neúspešná"
-
 #~ msgid "removing reference from way {0}"
 #~ msgstr "vybranie odkazu z cesty {0}"
@@ -30616,4 +31587,7 @@
 #~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
 
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "neočakávaná hodnota. Dostal {0}"
@@ -30703,4 +31677,7 @@
 #~ msgid "Group common Address Interpolation inputs in a single dialog,"
 #~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
+
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr "Nesprávne načítanie čítacieho prostriedku ''{0}''. Chyba je {1}"
 
 #~ msgid "Failed to launch the external help browser"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 19246)
+++ applications/editors/josm/i18n/po/sl.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-23 19:45+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:08+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -20,9 +21,9 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
@@ -89,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -294,4 +294,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr ""
@@ -322,5 +323,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -336,7 +337,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -468,6 +472,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -546,5 +551,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -558,5 +563,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Informacije"
@@ -751,15 +756,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Izbriši"
@@ -837,6 +842,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1477,14 +1482,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Nastavitve ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Odpri stran z nastavitvami za splošne nastavitve."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Nastavitve"
@@ -1626,17 +1632,17 @@
 msgstr "Pomoč: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Poročilo stanja"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopiraj na odložišče in zapri"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1777,43 +1783,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Izberite bodisi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Eno vozlišče z oznakami"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Eno vozlišče, ki je del več poti, ali"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1823,9 +1829,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1833,5 +1839,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1996,4 +2002,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Nazaj"
@@ -3179,24 +3187,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Nastavitve shranjene na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3205,5 +3213,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3214,5 +3222,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3630,6 +3638,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3797,5 +3805,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3810,10 +3818,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "cesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3821,15 +3829,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vodotok"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "raba tal"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3844,6 +3852,11 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Javni prevoz"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3854,5 +3867,5 @@
 msgstr[3] "{0} člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3894,9 +3907,18 @@
 msgstr "Spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Povezava ni uspela."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+msgid "Authorisation Failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Neznan gostitelj"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -3996,65 +4018,65 @@
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "uporaba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Prikaži to pomoč"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Odpri datoteko (če .gpx, potem kot surov GPS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Nastavi jezik."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4063,9 +4085,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "primeri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4073,25 +4095,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktiviranje posodobljenih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Privzete nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4104,5 +4126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4111,5 +4133,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4217,5 +4239,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4873,5 +4895,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4886,5 +4908,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4892,5 +4914,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4980,5 +5002,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "brez"
@@ -5158,5 +5180,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5168,5 +5190,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5261,5 +5283,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5268,5 +5290,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5347,13 +5369,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Dodaj"
@@ -5484,54 +5506,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relacije"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Odpri seznam vseh relacij."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Odpri urejevalnik za izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Izbriši izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6866,58 +6888,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6925,58 +6947,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6984,9 +7006,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -6994,5 +7016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7000,15 +7022,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7016,9 +7038,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7027,5 +7049,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7052,9 +7074,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Osnovno"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7064,5 +7087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7073,5 +7096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7113,22 +7136,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7137,10 +7162,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7149,10 +7174,10 @@
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7163,5 +7188,5 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7172,9 +7197,9 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Izberite vrednost"
@@ -7202,57 +7227,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Izbor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Izbrana površina"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
 msgstr ""
@@ -7310,5 +7333,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7322,11 +7345,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7939,6 +7962,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8980,6 +9004,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9065,9 +9089,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9089,4 +9112,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9524,24 +9554,24 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Datoteke GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Napaka pri razčlenjevanju {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ni bilo možno prebrati \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9550,34 +9580,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9585,114 +9615,116 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9700,38 +9732,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9740,5 +9772,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9747,56 +9779,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Berem {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9806,22 +9838,22 @@
 msgstr[3] "slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10005,4 +10037,570 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Uporabi privzeto datoteko."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Avtorji"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Uporabniško ime"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Geslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+msgid "Granted rights"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Napredne nastavitve"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Avtorji"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Prosim, vnesite iskalni izraz."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Dostop"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Napredne nastavitve"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Izberite vsaj eno pot"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+msgid "Please enter an Access Token Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Prosim, izberize vsaj eno vozlišče ali pot."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+msgid "Close the dialog and cancel authorisation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Pošiljanje nastavitev"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Zahtevaj posodobitev"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Izposojevalnica"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Dostop"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Posodobitev ni uspela"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+msgid "Retrieving user info..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -10034,5 +10632,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10040,5 +10638,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10046,7 +10644,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Prosim izberite vrstico za izbris."
@@ -10483,12 +11081,4 @@
 msgstr "Podatki OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Ohrani varnostne kopije datotek"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Pri shranjevanju ohrani varnostne kopije s končnico \"~\""
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10527,17 +11117,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Videz in občutek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Jezik"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Privzeto (samodejna izbira)"
@@ -10604,10 +11189,19 @@
 msgstr "Nastavi vire vstavkov"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Ponastavi nastavitve na privzete"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Nastavitve prikaza"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10615,29 +11209,29 @@
 msgstr "Različne nastavitve, ki vplivajo na izgled celotne aplikacije."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Nastavitve povezave"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavitve povezave do strežnika OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Nastavitve zemljevida"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Nastavitve zvoka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM."
@@ -10664,86 +11258,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+msgid "Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Nastavitve posredovalnega strežnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Osnovni URL naslov strežnika"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM geslo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11019,4 +11554,251 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Povezava ni uspela."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Pri shranjevanju ohrani varnostne kopije s končnico \"~\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM uporabniško ime (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM geslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>POZOR: Geslo je shranjeno v datoteki z nastavitvami v obliki navadnega "
+"besedila.<br>Geslo se na strežnik prenaša nekriptirano v naslovu URL."
+"<br><b>Ne uporabljaj gesla enakega nekeu drugemu pomembnemu geslu.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Nastavitve"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Osnovni URL naslov strežnika"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Preveri"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Trenutna vrednost je privzeta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11162,5 +11944,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11212,23 +11994,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11237,16 +12025,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11254,5 +12042,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11260,5 +12048,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11494,5 +12282,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11536,5 +12324,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11582,30 +12370,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11764,4 +12552,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12059,23 +12862,28 @@
 "internetom."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Berem {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12460,5 +13268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12467,5 +13275,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12475,5 +13283,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12483,5 +13291,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12490,5 +13323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12497,5 +13330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12504,9 +13337,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12515,5 +13348,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12523,5 +13356,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12530,5 +13363,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12537,5 +13370,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12544,10 +13377,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12556,10 +13389,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12570,5 +13403,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12578,5 +13411,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12587,18 +13420,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12625,4 +13445,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13002,5 +13828,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13051,5 +13877,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13058,25 +13890,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13085,13 +13915,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13099,34 +13929,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13138,18 +13968,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13157,5 +13987,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13163,44 +13993,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13311,5 +14141,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13317,14 +14147,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13332,14 +14162,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13347,21 +14177,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13470,28 +14300,28 @@
 msgstr "Prazna plast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13500,47 +14330,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr ""
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr ""
@@ -13702,6 +14532,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr ""
@@ -13928,33 +14758,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr ""
@@ -13994,5 +14824,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14003,80 +14833,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Ločljivost ploščic Landsat (pikslov na stopinjo)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Velikost ploščic Landsat (pikslov)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "Plast WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14084,5 +14914,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14090,5 +14920,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14096,5 +14926,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14102,45 +14932,45 @@
 "Ločljivost ploščic Landsat, merjena v pikslih na stopinjo. Privzeto 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
@@ -14351,5 +15181,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -14374,5 +15204,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14387,14 +15216,22 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14402,22 +15239,30 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14425,23 +15270,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Zapri"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Ustvari površine"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Ceste"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14463,10 +15336,10 @@
 msgstr "Neznana končnica datoteke: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14474,5 +15347,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr ""
@@ -14482,37 +15355,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "spremeni izbor"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14521,5 +15394,5 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr ""
@@ -14633,25 +15506,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14697,42 +15570,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Viri ploščic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -14962,37 +15835,37 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Uporabi plast napak."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15000,5 +15873,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr ""
@@ -15598,5 +16471,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "zgradba"
@@ -15610,5 +16483,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr ""
@@ -16000,55 +16873,55 @@
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Nastavitve WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Spremeni seznam strežnikov WMS, ki so prikazani v meniju WMS vstavka"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Naziv v meniju"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "Povezava do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Vpišite ime za meni in povezavo do WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17582,6 +18455,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
@@ -17607,6 +18480,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "hitra cesta"
@@ -17632,6 +18505,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "glavna"
@@ -17657,6 +18530,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "regionalna"
@@ -17670,5 +18543,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "regionalna (turistična)"
@@ -17686,5 +18559,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr ""
@@ -17718,6 +18591,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr ""
@@ -17751,6 +18624,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr ""
@@ -17800,5 +18673,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "krožišče"
@@ -18784,5 +19657,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20181,7 +21054,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr ""
@@ -20909,28 +21782,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "šport"
@@ -22625,4 +23498,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22657,9 +23538,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -24067,7 +24948,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr ""
@@ -24137,7 +25018,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24163,5 +25044,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr ""
@@ -24457,5 +25338,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24497,5 +25378,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24605,4 +25486,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24640,5 +25527,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24711,11 +25598,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24778,5 +25665,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24832,7 +25719,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -24903,9 +25790,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -24997,5 +25884,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25009,5 +25896,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25028,10 +25915,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25041,5 +25928,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25054,5 +25941,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr ""
@@ -25066,5 +25953,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr ""
@@ -25078,5 +25965,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25265,13 +26152,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25333,7 +26220,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25356,10 +26243,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25395,7 +26282,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25441,6 +26328,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25454,5 +26341,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25474,5 +26361,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25486,5 +26373,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25546,7 +26433,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25563,5 +26450,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25576,5 +26463,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25589,5 +26476,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25602,5 +26489,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25615,5 +26502,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25628,5 +26515,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25746,11 +26633,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25764,5 +26651,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr ""
@@ -25776,5 +26663,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr ""
@@ -25918,13 +26805,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr ""
@@ -25938,5 +26825,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26032,10 +26919,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26137,14 +27024,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26540,5 +27434,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26563,23 +27457,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26611,6 +27505,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26671,8 +27565,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr ""
@@ -27025,26 +27919,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr ""
@@ -27116,8 +28010,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr ""
@@ -27188,5 +28082,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27195,5 +28089,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27203,5 +28097,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27210,5 +28104,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27218,9 +28112,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr ""
@@ -27308,14 +28202,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr ""
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27324,5 +28217,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr ""
@@ -27336,5 +28229,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27356,5 +28249,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27368,5 +28261,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr ""
@@ -27380,5 +28273,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27401,5 +28294,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27413,5 +28306,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr ""
@@ -27425,5 +28318,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27437,5 +28330,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27449,5 +28342,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27504,7 +28397,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr ""
@@ -27518,5 +28411,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr ""
@@ -27529,5 +28422,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr ""
@@ -27542,5 +28435,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr ""
@@ -27554,5 +28447,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr ""
@@ -27607,8 +28500,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27622,5 +28515,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27634,5 +28527,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27646,5 +28539,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27658,5 +28551,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr ""
@@ -27670,5 +28563,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr ""
@@ -27746,8 +28639,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr ""
@@ -27770,4 +28663,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27795,7 +28729,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr ""
@@ -27945,11 +28884,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -27997,6 +28936,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr ""
@@ -28352,4 +29291,9 @@
 msgstr ""
 
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
+
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -28407,7 +29351,4 @@
 #~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
 
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uporabniško ime (email)"
-
 #~ msgid "Enter Password"
 #~ msgstr "Vnesite geslo"
@@ -28518,7 +29459,4 @@
 #~ msgstr "Geslo na posredovalnem strežniku"
 
-#~ msgid "Request Update"
-#~ msgstr "Zahtevaj posodobitev"
-
 #~ msgid "Edit Station"
 #~ msgstr "Uredi postajo"
@@ -28535,7 +29473,4 @@
 #~ msgid "Help / About"
 #~ msgstr "Pomoč / O programu"
-
-#~ msgid "Validate"
-#~ msgstr "Preveri"
 
 #~ msgid "AgPifoJ - Geotagged pictures"
@@ -28635,14 +29570,4 @@
 #~ msgstr "napaka pri oddaji zahtevka za pososobitev"
 
-#~ 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>POZOR: Geslo je shranjeno v datoteki z nastavitvami v obliki "
-#~ "navadnega besedila.<br>Geslo se na strežnik prenaša nekriptirano v "
-#~ "naslovu URL.<br><b>Ne uporabljaj gesla enakega nekeu drugemu pomembnemu "
-#~ "geslu.</b></html>"
-
 #~ msgid "Anonymous"
 #~ msgstr "Anonimno"
@@ -28699,7 +29624,4 @@
 #~ msgstr "Ni podatkov"
 
-#~ msgid "Update failed"
-#~ msgstr "Posodobitev ni uspela"
-
 #~ msgid "Update Selection"
 #~ msgstr "Posodobi izbor"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 19246)
+++ applications/editors/josm/i18n/po/sv.po	(revision 19319)
@@ -5,4 +5,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,7 +12,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-11-17 18:09+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-06 05:23+0000\n"
+"Last-Translator: Andreas Vilén <andreas.vilen@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +20,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
@@ -88,9 +89,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -117,5 +118,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -123,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -134,9 +135,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -175,5 +176,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -201,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -276,6 +276,6 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"VARNING: konstigt skriven URL till API:et. Länkar till info och historik "
-"sidorna kommer antagligen inte att fungera. API URL:en är \"{0}\"."
+"VARNING: felaktigt skriven URL till API:t. Länkar till info- och "
+"historiksidorna kommer antagligen inte att fungera. API-URL:en är \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -285,6 +285,6 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"VARNING: konstigt skriven URL till API:et. Länkar till användar sidor kommer "
-"antagligen inte att fungera. API URL:en är \"{0}\"."
+"VARNING: felaktigt skriven URL till API:t. Länkar till användarsidor kommer "
+"antagligen inte att fungera. API-URL:en är \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -294,7 +294,10 @@
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
+"Du håller på att starta {0} webbläsarfönster.<br>Detta kan både fylla din "
+"skärm med webbläsarfönster<br>och ta ett tag att slutföra."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Fortsätt"
@@ -325,5 +328,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -339,7 +342,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -451,17 +457,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:223
 msgid "Please enter a valid latitude in the range -90..90"
-msgstr ""
+msgstr "Vänligen välj en korrekt latitud i området -90..90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:226
 msgid "Please enter a latitude in the range -90..90"
-msgstr ""
+msgstr "Vänligen välj en korrekt latitud i området -90..90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:234
 msgid "Please enter a valid longitude in the range -180..180"
-msgstr ""
+msgstr "Vänligen välj en korrekt longitud i området -90..90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:237
 msgid "Please enter a longitude in the range -180..180"
-msgstr ""
+msgstr "Vänligen välj en korrekt longitud i området -90..90"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:273
@@ -473,6 +479,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -485,9 +492,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
 msgid "Close the dialog and create a new node"
-msgstr ""
+msgstr "Stäng dialogrutan och skapa en ny nod"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
 msgid "Close the dialog, don't create a new node"
-msgstr ""
+msgstr "Stäng dialogrutan men skapa ingen nod"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
@@ -551,5 +558,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -563,5 +570,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Information"
@@ -762,15 +769,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Ta bort"
@@ -817,5 +824,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
-msgstr ""
+msgstr "Hämta överordnade vägar/relationer..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
@@ -828,5 +835,5 @@
 #, java-format
 msgid "Id > 0 required, got {0}"
-msgstr ""
+msgstr "Id > 0 krävs, har {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
@@ -849,6 +856,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -863,5 +870,5 @@
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgstr "Parametern \"{0}\" får inte vara null"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
@@ -880,15 +887,15 @@
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
+msgstr "({0}/{1}) Laddar noden {2}:s överordnade"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
+msgstr "({0}/{1}) Laddar vägen {2}:s överordnade"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
+msgstr "({0}/{1}) Laddar relationen {2}:s överordnade"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -918,14 +925,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
 msgid "Fullscreen View"
-msgstr ""
+msgstr "Helskärmsvy"
 
 #. no icon
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
 msgid "Toggle fullscreen view"
-msgstr ""
+msgstr "Växla helskärmsvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
 msgid "Toggle Fullscreen view"
-msgstr ""
+msgstr "Växla helskärmsvy"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
@@ -1038,5 +1045,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
-msgstr "Objekt historik"
+msgstr "Objektshistorik"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
@@ -1153,5 +1160,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931
 msgid "Join Areas Function"
-msgstr ""
+msgstr "Ytsammanslagningsfunktion"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
@@ -1237,5 +1244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126
 msgid "Abort Merging"
-msgstr ""
+msgstr "Avbryt sammanslagning"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128
@@ -1248,4 +1255,5 @@
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
+"Kan inte slå ihop noder, då detta skulle radera väg ''{0}'' som används."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:230
@@ -1343,18 +1351,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:118
 msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr ""
+msgstr "<html>Kan inte öppna mapp.<br>Välj en fil!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
 msgid "Open file"
-msgstr ""
+msgstr "Öppna fil"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:159
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Öppnar 1 fil..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:161
 #, java-format
 msgid "Opening {0} files..."
-msgstr ""
+msgstr "Öppnar {0} filer..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1386,5 +1394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
+msgstr "Skriv in URL:n till datan du vill hämta"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
@@ -1398,13 +1406,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
+msgstr "Påbörja hämtning av data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Stäng dialogen och avbryt hämtning"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
 msgid "Download Data"
-msgstr ""
+msgstr "Hämta data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1429,5 +1437,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99
 msgid "Orthogonalize / Undo"
-msgstr ""
+msgstr "Räta ut vinkel / ångra"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
@@ -1437,8 +1445,10 @@
 "action!"
 msgstr ""
+"Räta ut form / ångra\n"
+"Välj noder som flyttades vid förra formuträtningen!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108
 msgid "Undo Orthogonalize Shape"
-msgstr ""
+msgstr "Ångra formuträtning"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118
@@ -1463,5 +1473,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
+msgstr "Valda element kan ej rätas ut"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
@@ -1501,14 +1511,15 @@
 msgstr[1] "till {0} primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Inställningar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Öppna en inställningssida för globala inställningar."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Inställningar"
@@ -1654,17 +1665,17 @@
 msgstr "Hjälp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "Kopiera till urklipp och stäng"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1767,4 +1778,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
+"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya vägar."
+"<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431
@@ -1773,4 +1786,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
+"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya vägar."
+"<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:436
@@ -1806,34 +1821,34 @@
 msgstr "Denna nod är inte bunden till något annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen av dessa noder hänger ihop med någonting annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen av noderna på denna sträcka är knuten till något annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Det nuvarande urvalet kan inte användas för att frigöra något."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Välj antingen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* En nod med tagg, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* En nod som används av mer än en sträcka, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1842,5 +1857,5 @@
 "eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1849,5 +1864,5 @@
 "sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1862,9 +1877,9 @@
 "få sina egna kopior och alla noder kommer att vara valda."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Frigjord nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1872,5 +1887,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1912,5 +1927,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Updates the objects in the active data layer from the server."
-msgstr ""
+msgstr "Uppdaterar objekten i det aktiva datalagret från servern."
 
 #. bounds defined? => use the bbox downloader
@@ -1919,5 +1934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:971
 msgid "Download data"
-msgstr ""
+msgstr "Hämta data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:23
@@ -1938,19 +1953,19 @@
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
-msgstr ""
+msgstr "Hittade inte något objekt med id {0} i det nuvarande datasettet"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
 msgid "Update selection"
-msgstr ""
+msgstr "Uppdatera val"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
-msgstr ""
+msgstr "Uppdaterar de valda objekten från servern (hämtar data på nytt)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
 msgid "There are no selected objects to update."
-msgstr ""
+msgstr "Det finns inga valda objekt att uppdatera"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
@@ -1961,9 +1976,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Upload data"
-msgstr ""
+msgstr "Ladda upp data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr ""
+msgstr "Ladda upp alla ändringar i det aktiva datalagret till OSM-servern"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
@@ -1973,4 +1988,6 @@
 "resolve them first.</html>"
 msgstr ""
+"<html>Det finns olösta konflikter i lager ''{0}''.<br>Du måste lösa dem "
+"först.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
@@ -1986,9 +2003,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
 msgid "Upload selection"
-msgstr ""
+msgstr "Ladda upp val"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr ""
+msgstr "Ladda upp alla ändringar i nuvarande val till OSM-servern"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258
@@ -2035,4 +2052,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Tillbaka"
@@ -2123,9 +2142,9 @@
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
+msgstr "Ignorerar undantag eftersom hämtningen avbrutits. Undantaget var: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144
 msgid "No data found in this area."
-msgstr ""
+msgstr "Ingen data fanns i detta område."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
@@ -2140,5 +2159,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
 msgid "Check on the server"
-msgstr ""
+msgstr "Kontrollera på servern"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2147,4 +2166,6 @@
 "server"
 msgstr ""
+"Klicka för att kontrollera om objekt i ditt lokala dataset har raderats från "
+"servern"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2155,5 +2176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
 msgid "Click to abort and to resume editing"
-msgstr ""
+msgstr "Klicka för att avbryta och fortsätta redigera"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2179,5 +2200,5 @@
 #, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr ""
+msgstr "Följande fel uppstod under masshämtning: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
@@ -2188,5 +2209,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
 msgid "Errors during download"
-msgstr ""
+msgstr "Fel under hämtning"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
@@ -2358,4 +2379,7 @@
 "Really move them?"
 msgstr ""
+"Du flyttade fler än {0} element. Detta är ofta ett tecken på att något är "
+"fel.\n"
+"Säker på att du vill flytta dem?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
@@ -3245,24 +3269,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Inställningar lagrade på {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Kunde inte hämta inställningar från server."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3271,5 +3295,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3280,5 +3304,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3692,6 +3716,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3857,5 +3881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3870,10 +3894,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "landsväg"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3881,15 +3905,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "vattendrag"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "markanvändning"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3902,6 +3926,11 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Kollektivtrafik"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3910,5 +3939,5 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3950,9 +3979,19 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Anslutning misslyckades"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Anslutning misslyckades"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Okänd värddator"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4058,65 +4097,65 @@
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Öppna fil (som rå gps, om .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Ange språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4125,9 +4164,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4137,25 +4176,25 @@
 "data innan --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Istället för --download=<bbox> kan du använda osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Aktiverar uppdaterade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4168,5 +4207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4175,5 +4214,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4281,5 +4320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4939,5 +4978,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4952,5 +4991,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4958,5 +4997,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -5046,5 +5085,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "inget"
@@ -5224,5 +5263,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5234,5 +5273,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5327,5 +5366,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5334,5 +5373,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5414,13 +5453,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Lägg till"
@@ -5551,54 +5590,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "Öppna en lista över alla relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Öppna en redigerare för den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Ta bort den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Skapa en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6935,58 +6974,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6994,58 +7033,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7053,9 +7092,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7063,5 +7102,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7069,15 +7108,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7085,9 +7124,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7096,5 +7135,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7121,9 +7160,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "Grundläggande"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7133,5 +7173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7142,5 +7182,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7182,22 +7222,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7206,10 +7248,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7218,10 +7260,10 @@
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7230,5 +7272,5 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7237,9 +7279,9 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Välj ett värde"
@@ -7267,61 +7309,57 @@
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Markering"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Välj alternativ för linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Välj alternativ för linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Välj alternativ för linjeritning"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7377,5 +7415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7389,12 +7427,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}) Laddar relationen {2}:s överordnade"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -8007,6 +8045,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9053,6 +9092,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9138,9 +9177,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9162,4 +9200,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9597,24 +9642,24 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fel vid tolkning {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kunde inte öppna \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9626,34 +9671,34 @@
 "välj en tidzon<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Fototid (från exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Gps-tid (läst från fotot ovan): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Jag är i följande tidzon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Inget datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Öppna ett annat foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9663,114 +9708,116 @@
 "Använd begärt format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Ogiltigt datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<Inget GPX-spår har hämtats än>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX-spår: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Öppna ett annat foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "Auto-gissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Tidszon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Förskjutning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "Sätt bilder i relation till GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "Korrelera"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Ogiltig förskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9778,21 +9825,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "De markerade fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "Fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -9800,17 +9847,17 @@
 "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX-spåret saknar tidsinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "Välj ett GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "Inget GPX-spår har valts"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9821,5 +9868,5 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9830,56 +9877,56 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extraherar GPS-plats från EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "Påbörjar foldergenomläsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Läs in foton..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "Läser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Läser igenom folder {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fel vid läsning av filer från folder {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
@@ -9887,22 +9934,22 @@
 msgstr[1] "bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} hittades med gps-taggar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10093,4 +10140,576 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Använd globala inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Upphovsmän"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "Användarnamn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "Lösenord"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Rotera åt höger"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Lägg till egenskaper"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Upphovsmän"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Ange ett användarnamn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Ange ett användarnamn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "Misslyckades att initialisera API."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "Avancerade inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Ange ett användarnamn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Ange ett användarnamn"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "Markera minst en nod eller sträcka."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Inga sökträffar för ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Stäng dialogen och avbryt hämtning"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "Stäng dialogrutan och skapa en ny nod"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Skicka in inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Begär omrendering"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurang"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Källa"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Uppdatering misslyckades"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "Tar bort dubblettnoder..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10124,5 +10743,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10130,5 +10749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10136,7 +10755,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Välj vilken rad du vill ta bort."
@@ -10597,12 +11216,4 @@
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Behåll backup-filer"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "När man sparar, behåll backup-filer som slutar på ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10641,17 +11252,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Utseende och känsla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Förval (automatiskt satt)"
@@ -10718,10 +11324,20 @@
 msgstr "Konfigurera hämtställen för insticksmoduler"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "Stäng dialogrutan och skapa en ny nod"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Återställ inställningarna till förval"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Visningsinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10730,29 +11346,29 @@
 "Olika inställningar som påverkar hur hela programmet representeras visuellt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Anslutningsinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "Anslutningsinställningar för OSM-servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Kartinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Inställningar för kartprojektion och datatolkning."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Ljudinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Inställnignar för ljudspelare och ljudmarkörer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
@@ -10780,87 +11396,28 @@
 msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "Sevärdhet"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxyinställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Bas-URL för OSM-servern (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Bas-URL för servern"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM-lösenord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11164,4 +11721,252 @@
 msgstr "Modifierargrupper"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Anslutning misslyckades."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Använd förval"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Behåll backup-filer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "När man sparar, behåll backup-filer som slutar på ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM-användarnamn (email)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM-lösenord"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>VARNING: Lösenordet lagras okryperat i inställningsfilen."
+"<br>Lösenordet skickas okryperat till servern, som en del av URL:en."
+"<br><b>Använd inte ett värdefullt lösenord.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Bas-URL för servern"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Validera"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Nuvarande värde är förval."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11305,5 +12110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11355,23 +12160,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11380,16 +12191,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11397,5 +12208,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11403,5 +12214,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11637,5 +12448,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11679,5 +12490,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11725,30 +12536,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11907,4 +12718,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12201,23 +13027,28 @@
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "Läser {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12606,5 +13437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12613,5 +13444,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12621,5 +13452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12632,5 +13463,30 @@
 "är: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12639,5 +13495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12646,5 +13502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12653,9 +13509,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12664,5 +13520,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12672,5 +13528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12679,5 +13535,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12686,5 +13542,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12693,10 +13549,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12705,10 +13561,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12719,5 +13575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12727,5 +13583,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12736,18 +13592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12775,4 +13618,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13160,5 +14009,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13209,5 +14058,11 @@
 msgstr "CadastreGrabber: Ogiltig URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13216,25 +14071,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "Välj en av..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr "Välj commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "Välj en av..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "Automatkälla"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13243,13 +14096,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13257,34 +14110,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "Ersätt originalets bakgrund med JOSM:s bakgrundsfärg."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "Gör bakgrunden genomskinlig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "Rita gränser för hämtade data."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "Aktivera automatisk cachning."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "Största tillåtna cachestorlek (MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13296,9 +14149,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "Fransk Cadastre-WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -13306,10 +14159,10 @@
 "källa är aktiverat.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "Källa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13319,5 +14172,5 @@
 "JOSM:s inställningar."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13327,44 +14180,44 @@
 "gråtoner). Användbart för text på mörka bakgrunder."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Rita en rektangel runt data nedladdad från WMS-servern."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids"
@@ -13475,5 +14328,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13481,14 +14334,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13496,14 +14349,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13511,21 +14364,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13634,28 +14487,28 @@
 msgstr "Tomt lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-lager ({0}), {1} ruta/rutor inlästa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "Är inte vektoriserad"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "Är vektoriserad"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13666,47 +14519,47 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Använd"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Välj schema att använda."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Färgschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Välj schema att ta bort."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "Använd valt schema från listan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Använd de nuvarade färgerna som ett nytt färgschema."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Ta bort valt schema från listan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Färgscheman"
@@ -13868,6 +14721,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Uppdatera"
@@ -14097,33 +14950,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "öster"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "nordöst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "norr"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "nordväst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "väster"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "sydväst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "söder"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "sydöst"
@@ -14163,5 +15016,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14172,81 +15025,81 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "vatten"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "kustlinje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Största tillåtna antal delsträckor per sträcka"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "Största tillåtna antal noder i grundspåret"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximalt gråskalevärde att räkna som vatten (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "Noggrannhet vid linjeförenkling (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Upplösning på landsatrutor (pixlar per grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Storlek på landsatrutor (pixlar)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Förskjut alla spår österut (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Förskjut alla spår norrut (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Riktning att söka efter land i"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Tagga sträckor som"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS-lager"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Största tillåtna cachestorlek (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Största tillåtna cacheålder (dagar)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Källtext"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14256,5 +15109,5 @@
 "av linje). Förval 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14264,5 +15117,5 @@
 "Kan vara mellan 0-255. Förval 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14272,26 +15125,26 @@
 "värden ger fler noder och en mer noggrann linje. Förval: 0,0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Upplösning på landsatrutor mätt i pixlar per grad. Förval 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Storlek på en landsatruta, mätt i pixlar. Förval 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Förskjut alla punkter i östlig riktning (grader). Förval: 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Förskjut alla punkter i nordlig riktning (grader). Förval 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "I vilken riktning som land skall eftersökas. Förval öster."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -14299,27 +15152,27 @@
 "lämna otaggat (nothing). Förval är vatten."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Vilket WMS-lager skall användas som underlag för spårning. Förval är IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Största tillåtna storlek för varje cache-bibliotek i byte. Förval är 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Största tillåtna ålder för varje cachad fil i dagar. Förval är 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Text som anger datakälla. Förval är Landsat"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "En insticksmodul för att spåra vattensamlingar på landsat-bilder."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Inställningar för insticksmodulen Lakewalker"
@@ -14530,5 +15383,5 @@
 msgstr "Hämtningsloop för OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Visar problemfall från OpenStreetBugs"
@@ -14555,5 +15408,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14569,14 +15421,22 @@
 "Huvudet innehåller flera värden och kan inte mappas till en enda sträng"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "Öppna OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14586,22 +15446,31 @@
 "från OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Lägg till kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Skriv in din kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Allmänning"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Markera som slutförd"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Är du säker på att du vill stänga?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14609,23 +15478,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Stäng"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Nytt problemfall"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Skapa ett problemfall"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "Beskriv problem noggrannt"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Korrelera"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Ange ett användarnamn"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Okänd status för problemfall"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "Öppna OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14647,10 +15544,10 @@
 msgstr "Okänt filformat: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14660,5 +15557,5 @@
 "kartinställningssidan av inställningar."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox-applikationen"
@@ -14668,37 +15565,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "ändra urval"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "ändra vad som visas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "bekräfta alla fjärrstyrda handlingar manuellt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Inställningar för insticksmodulen Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14710,5 +15607,5 @@
 "applikationer i kommunikation med insticksmodulen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Tillåtna handlingar"
@@ -14822,25 +15719,25 @@
 msgstr "Rensa rutten"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "Inställningar för insticksmodulen för ruttberäkning"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "Konfigurera ruttberäkning"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "Typ av väg"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "Hastighet (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "Vikt"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "Ange viktvärden"
@@ -14886,42 +15783,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "automatisk zoomning"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "automatisk hämtning av rutor"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "GlidandeKarta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "Inställningar för insticksprogrammet GlidandeKarta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Källor för rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "Automatisk zoomning: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "Automatisk hämtning av rutor: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "Största tillåtna zoomläge: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "Tona bakgrund: "
@@ -15158,37 +16055,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Använd undantagslista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Använd undantagslista för att avstå från att visa varning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Använd fellager."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Använd fellagret för att visa problematiska element."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "På begäran"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Vid inskickning"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15198,5 +16095,5 @@
 "och redigeringsprogram."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Datavalidator"
@@ -15810,5 +16707,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "byggnad (building)"
@@ -15822,5 +16719,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "yta (area)"
@@ -16220,56 +17117,56 @@
 msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "Inställningar för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
 "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Menynamn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Menynamn (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS-url (Förval)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Ange ett menynamn och en URL för WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -16483,4 +17380,6 @@
 "defined in routes.xml file in plugin directory"
 msgstr ""
+"Renderar rutter (busslinjer, vandringsleder, cykelrutter osv). Ruttyper "
+"måste definieras i routes.xml i insticksmodulens mapp"
 
 #. Plugin routing
@@ -16603,5 +17502,5 @@
 #: build/trans_presets.java:68
 msgid "Highways"
-msgstr ""
+msgstr "Vägar"
 
 #. group "Highways"
@@ -17805,6 +18704,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorväg"
@@ -17830,6 +18729,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "stamväg"
@@ -17855,6 +18754,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "primärväg"
@@ -17880,6 +18779,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "sekundärväg"
@@ -17893,5 +18792,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiärväg"
@@ -17909,5 +18808,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "bostadsgata"
@@ -17941,6 +18840,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "tillfartsväg"
@@ -17974,6 +18873,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "under byggnad"
@@ -18023,5 +18922,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "rondell"
@@ -18317,5 +19216,5 @@
 #: build/trans_presets.java:770
 msgid "Services"
-msgstr ""
+msgstr "Tjänster"
 
 #. item "Waypoints/Services"
@@ -18542,5 +19441,5 @@
 #: build/trans_presets.java:832
 msgid "Incline"
-msgstr ""
+msgstr "Lutning"
 
 #. item "Waypoints/Incline"
@@ -18548,5 +19447,5 @@
 #: build/trans_presets.java:835
 msgid "Incline Steep"
-msgstr ""
+msgstr "Brant lutning"
 
 #. item "Waypoints/Incline Steep"
@@ -18830,10 +19729,10 @@
 #: build/trans_presets.java:1034
 msgid "Turnstile"
-msgstr ""
+msgstr "Vändkors"
 
 #. item "Barriers/Turnstile"
 #: build/trans_presets.java:1035
 msgid "Edit Turnstile"
-msgstr ""
+msgstr "Redigera vändkors"
 
 #. item "Barriers/Turnstile" check "Bicycle"
@@ -19007,5 +19906,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "kärr"
@@ -19304,5 +20203,5 @@
 #: build/trans_presets.java:1276
 msgid "Monorail"
-msgstr "monorail"
+msgstr "Monorail"
 
 #. item "Transport/Railway/Monorail"
@@ -19976,5 +20875,5 @@
 #: build/trans_presets.java:2472
 msgid "Shelter"
-msgstr "VIndskydd"
+msgstr "Vindskydd"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
@@ -20035,5 +20934,5 @@
 #: build/trans_presets.java:1567
 msgid "Travel"
-msgstr ""
+msgstr "Turism"
 
 #. group "Travel"
@@ -20404,7 +21303,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "gata"
@@ -20443,5 +21342,5 @@
 #: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Rutter visas för:"
 
 #. item "Tourism/Map" check "Hiking"
@@ -20480,5 +21379,5 @@
 #: build/trans_presets.java:1736
 msgid "Information Board"
-msgstr ""
+msgstr "Informationstavla"
 
 #. item "Tourism/Information Board" text "Name"
@@ -20615,5 +21514,5 @@
 #: build/trans_presets.java:1830
 msgid "Palaeontological Site"
-msgstr ""
+msgstr "Paleografisk plats"
 
 #. item "Historic Places/Palaeontological Site"
@@ -20621,5 +21520,5 @@
 #: build/trans_presets.java:1832
 msgid "Edit Palaeontological Site"
-msgstr ""
+msgstr "Redigera paleografisk plats"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -20714,5 +21613,5 @@
 #: build/trans_presets.java:1883 build/trans_presets.java:2702
 msgid "Sports"
-msgstr ""
+msgstr "Idrott"
 
 #. group "Sports"
@@ -21132,28 +22031,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "sport"
@@ -22848,4 +23747,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22880,9 +23787,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr ""
@@ -23020,10 +23927,10 @@
 #: build/trans_presets.java:2519
 msgid "Chemist"
-msgstr ""
+msgstr "Hygien"
 
 #. item "Shops/Chemist"
 #: build/trans_presets.java:2520
 msgid "Edit Chemist"
-msgstr ""
+msgstr "Redigera hygienbutik"
 
 #: build/trans_presets.java:2525
@@ -23049,19 +23956,19 @@
 #: build/trans_presets.java:2539
 msgid "Book Store"
-msgstr ""
+msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
 #: build/trans_presets.java:2540
 msgid "Edit Book Store"
-msgstr ""
+msgstr "Redigera bokhandel"
 
 #: build/trans_presets.java:2545
 msgid "Travel Agency"
-msgstr ""
+msgstr "Resebyrå"
 
 #. item "Shops/Travel Agency"
 #: build/trans_presets.java:2546
 msgid "Edit Travel Agency"
-msgstr ""
+msgstr "Redigera resebyrå"
 
 #: build/trans_presets.java:2551
@@ -23201,5 +24108,5 @@
 #: build/trans_presets.java:2593
 msgid "Alcohol"
-msgstr ""
+msgstr "Alkohol"
 
 #. item "Shops/Alcohol"
@@ -23207,5 +24114,5 @@
 #: build/trans_presets.java:2595
 msgid "Edit Alcohol Shop"
-msgstr ""
+msgstr "Redigera alkoholbutik"
 
 #: build/trans_presets.java:2600
@@ -23229,5 +24136,5 @@
 #: build/trans_presets.java:2612
 msgid "Electronics"
-msgstr "Electronik"
+msgstr "Elektronik"
 
 #. item "Shops/Electronics"
@@ -23366,5 +24273,5 @@
 #: build/trans_presets.java:2708
 msgid "Optician"
-msgstr ""
+msgstr "Optiker"
 
 #. item "Shops/Optician"
@@ -23509,5 +24416,5 @@
 #: build/trans_presets.java:2791
 msgid "Geography"
-msgstr ""
+msgstr "Geografi"
 
 #. group "Geography"
@@ -23645,5 +24552,5 @@
 #: build/trans_presets.java:2871
 msgid "Islet"
-msgstr ""
+msgstr "Holme"
 
 #. item "Geography/Places/Islet"
@@ -23651,5 +24558,5 @@
 #: build/trans_presets.java:2873
 msgid "Edit Islet"
-msgstr ""
+msgstr "Redigera holme"
 
 #. item "Geography/Places/Islet" text "Name"
@@ -23706,5 +24613,5 @@
 #: build/trans_presets.java:2908
 msgid "National"
-msgstr "Nationella"
+msgstr "Nationell"
 
 #. item "Boundaries/National"
@@ -23736,5 +24643,5 @@
 #: build/trans_presets.java:2926
 msgid "Political"
-msgstr ""
+msgstr "Politisk"
 
 #. item "Boundaries/Political"
@@ -23746,5 +24653,5 @@
 #: build/trans_presets.java:2932
 msgid "National park"
-msgstr ""
+msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
@@ -24208,5 +25115,5 @@
 #: build/trans_presets.java:3184
 msgid "Route"
-msgstr ""
+msgstr "Rutt"
 
 #. item "Relations/Route"
@@ -24215,5 +25122,5 @@
 #: build/trans_presets.java:3187
 msgid "Edit Route"
-msgstr ""
+msgstr "Redigera rutt"
 
 #. item "Relations/Route" label "Edit Route"
@@ -24221,5 +25128,5 @@
 #: build/trans_presets.java:3189
 msgid "Route type"
-msgstr ""
+msgstr "Ruttyp"
 
 #. item "Relations/Route" combo "Route type"
@@ -24290,7 +25197,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "cykel"
@@ -24360,7 +25267,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "fot"
@@ -24386,5 +25293,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "tunnelbana"
@@ -24680,5 +25587,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "förlegad"
@@ -24720,5 +25627,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "häst"
@@ -24828,4 +25735,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24863,5 +25776,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24934,11 +25847,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -25001,5 +25914,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -25055,7 +25968,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "landsvägsspår"
@@ -25126,9 +26039,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "räls"
@@ -25220,5 +26133,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25232,5 +26145,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25251,10 +26164,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "vändplats"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25264,5 +26177,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25277,5 +26190,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "flodbank"
@@ -25289,5 +26202,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "bäck"
@@ -25301,5 +26214,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "hamn"
@@ -25488,13 +26401,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -25556,7 +26469,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "järnvägspunkt"
@@ -25579,10 +26492,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25618,7 +26531,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25664,6 +26577,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25677,5 +26590,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -25697,5 +26610,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25709,5 +26622,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25769,7 +26682,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "linbana"
@@ -25786,5 +26699,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25799,5 +26712,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25812,5 +26725,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25825,5 +26738,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25838,5 +26751,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25851,5 +26764,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25969,11 +26882,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "kraft"
@@ -25987,5 +26900,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "pir"
@@ -25999,5 +26912,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "rörledning"
@@ -26141,13 +27054,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "fritid"
@@ -26161,5 +27074,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr "marina"
@@ -26255,10 +27168,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "inrättning"
@@ -26360,14 +27273,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26763,5 +27683,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26786,23 +27706,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26834,6 +27754,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26894,8 +27814,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "hälsa"
@@ -27248,26 +28168,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "affär"
@@ -27339,8 +28259,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotell"
@@ -27411,5 +28331,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27418,5 +28338,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27426,5 +28346,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27433,5 +28353,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27441,9 +28361,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turism"
@@ -27531,14 +28451,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "historisk"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27547,5 +28466,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "stenbrott"
@@ -27559,5 +28478,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27579,5 +28498,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "hamnbassäng"
@@ -27591,5 +28510,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "skog"
@@ -27603,5 +28522,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "gårdsplan"
@@ -27624,5 +28543,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "detaljhandel"
@@ -27636,5 +28555,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "industri"
@@ -27648,5 +28567,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27660,5 +28579,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27672,5 +28591,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27727,7 +28646,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "militär"
@@ -27741,5 +28660,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -27752,5 +28671,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "topp"
@@ -27765,5 +28684,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "glaciär"
@@ -27777,5 +28696,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "vulkan"
@@ -27830,8 +28749,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "naturfenomen"
@@ -27845,5 +28764,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "buskage"
@@ -27857,5 +28776,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "hed"
@@ -27869,5 +28788,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27881,5 +28800,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "lera"
@@ -27893,5 +28812,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "strand"
@@ -27969,8 +28888,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "rutt"
@@ -27993,4 +28912,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -28018,7 +28978,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "gräns"
@@ -28168,11 +29133,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "plats"
@@ -28220,6 +29185,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adress"
@@ -28364,5 +29329,5 @@
 #: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
-msgstr "felaktig highway tag på en nod"
+msgstr "felaktig highwaytagg på en nod"
 
 #. node : W : highway == track
@@ -28575,4 +29540,12 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Bas-URL för OSM-servern (REST API)"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
+
 #~ msgid "Move"
 #~ msgstr "Flytta"
@@ -28607,7 +29580,4 @@
 #~ msgid "Image"
 #~ msgstr "Bild"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
 
 #~ msgid "Select a bookmark first."
@@ -28840,7 +29810,4 @@
 #~ msgstr "hjälp"
 
-#~ msgid "Validate"
-#~ msgstr "Validera"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
@@ -28863,7 +29830,4 @@
 #~ msgid "error loading metadata"
 #~ msgstr "fel vid hämtning av metadata"
-
-#~ msgid "Request Update"
-#~ msgstr "Begär omrendering"
 
 #~ msgid "error requesting update"
@@ -29047,13 +30011,4 @@
 #~ msgid "Ill-formed node id"
 #~ msgstr "Felformaterad nod-id"
-
-#~ 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>VARNING: Lösenordet lagras okryperat i inställningsfilen."
-#~ "<br>Lösenordet skickas okryperat till servern, som en del av URL:en."
-#~ "<br><b>Använd inte ett värdefullt lösenord.</b></html>"
 
 #~ msgid ""
@@ -29440,7 +30395,4 @@
 #~ msgstr "Primitiv saknas"
 
-#~ msgid "Update failed"
-#~ msgstr "Uppdatering misslyckades"
-
 #~ msgid "Updating primitive"
 #~ msgstr "Uppdaterar primitiv"
@@ -29473,7 +30425,4 @@
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Misslyckades att initialisera API."
 
 #~ msgid "No data"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 19246)
+++ applications/editors/josm/i18n/po/tr.po	(revision 19319)
@@ -7,4 +7,5 @@
 #
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -13,7 +14,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-31 21:14+0000\n"
-"Last-Translator: Serdar Delican <Unknown>\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 15:27+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Türkçe\n"
 "MIME-Version: 1.0\n"
@@ -21,9 +22,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:20+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
@@ -90,9 +91,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -119,5 +120,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -125,6 +126,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -136,9 +137,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -177,5 +178,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -203,6 +203,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -295,4 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "Devam et"
@@ -323,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -337,7 +338,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -469,6 +473,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -547,5 +552,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -559,5 +564,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "Bilgi"
@@ -756,15 +761,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "Sil"
@@ -842,6 +847,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1486,14 +1491,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "Tercihler..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "Genel ayarlar için tercihler sayfasını aç."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "Tercihler"
@@ -1636,17 +1642,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "Durum Raporu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1776,33 +1782,33 @@
 msgstr "Bu kavşak başka bir nesneye yapışık değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Kavşakların hiçbiri herhangi bir nesneye yapışık değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Yolların kavşakları herhangi nesneye yapışık değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "Seçim çıkartmak için kullanılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Şunların Arasında Seçiniz:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* Birden fazla yol için kullanılan kavşak, veya"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Birden fazla yol için veya şu yollardan biri için, veya"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1811,5 +1817,5 @@
 "kullanılabilir, veya"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1817,5 +1823,5 @@
 "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1828,9 +1834,9 @@
 "kopyalarını oluşturur ve bütün kavşaklar seçilir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1838,5 +1844,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -2001,4 +2007,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "Geri"
@@ -3193,24 +3201,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Tercihler {0} üzerinde saklanıldı"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Could not upload preferences. Reason: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "Tercihler serverdan alınamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3219,5 +3227,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3228,5 +3236,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
 msgstr ""
 
@@ -3638,6 +3646,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3802,5 +3810,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3815,10 +3823,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "Karayolu"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3826,15 +3834,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "suyolu"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "arazi kullanımı"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3846,6 +3854,11 @@
 msgstr[0] "{0} Kavşak"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "Toplu taşıma"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3853,5 +3866,5 @@
 msgstr[0] "{0} üye"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3893,9 +3906,19 @@
 msgstr "Çelişki"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Bağlantı Hatası"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "Bağlantı Hatası"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "Tanımsız host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr ""
@@ -4002,65 +4025,65 @@
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Dosya Aç (ham gps, eğer .gpx ise)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "Kutu ile belirlenen alanı ham gps olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "Dil seçimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4069,9 +4092,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4081,25 +4104,25 @@
 "bir harita yükleyiniz --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox> indirmek yerine osm://<bbox> kullanabilirsin\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "Güncellenen eklentiler aktif olacak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4112,5 +4135,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4119,5 +4142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4225,5 +4248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr ""
@@ -4881,5 +4904,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4894,5 +4917,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4900,5 +4923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4988,5 +5011,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "boş"
@@ -5164,5 +5187,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5174,5 +5197,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5267,5 +5290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5274,5 +5297,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5353,13 +5376,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "Ekle"
@@ -5490,54 +5513,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "İlişkiler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "İlişkilerin listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "İlişkiler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "Seçili ilişki için bir editör aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "Seçili ilişkiyi sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "Yeni ilişki oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr ""
@@ -6872,58 +6895,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6931,58 +6954,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -6990,9 +7013,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7000,5 +7023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7006,15 +7029,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7022,9 +7045,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7033,5 +7056,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7058,9 +7081,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7070,5 +7094,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7079,5 +7103,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7119,22 +7143,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7143,10 +7169,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7155,10 +7181,10 @@
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "Değerleri Değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7166,5 +7192,5 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7172,9 +7198,9 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
@@ -7202,61 +7228,57 @@
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "Seçim"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "Çizim seçeneklerini seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "Çizim seçeneklerini seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "Çizim seçeneklerini seçiniz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7312,5 +7334,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7324,11 +7346,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr ""
 
@@ -7939,6 +7961,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -8980,6 +9003,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9065,9 +9088,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9089,4 +9111,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9515,24 +9544,24 @@
 msgstr[0] "{0} nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Dosyaları (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Ayrıştırma sırasında hata {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Okunamadı \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9544,34 +9573,34 @@
 "seçiniz<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "Fotoğraf zamanı (exif den):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Gps zamanı (fotoğraftan okundu): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [gg/aa/yyyy sa:dk:sn]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "Şu zaman dilimindeyim: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "Tarih Yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "Başka bir fotoğraf aç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "GPS receiver ile Fotoğrafın zamanını eşitle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9581,114 +9610,116 @@
 "Lütfen istenen formatı kullanın"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "Geçersiz Tarih"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<GPX izi yüklenmedi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX izi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "Başka GPX izi aç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "Zamandilimi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "imaj ile GPX izini ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "Geçersiz zaman dilimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "Geçersiz offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9696,38 +9727,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "GPX izi seçmelisiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "seçili GPX izi yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9738,5 +9769,5 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9747,78 +9778,78 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIF den GPS verisi çıkartılıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "klasör arama başladı"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "Fotoğraflar okunuyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "{0} Okunuyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kananoik yol klasör için bulunamadı {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Klasör aranıyor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Klasörde null dosya bulundu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "GPX e göre ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
 msgstr[0] "görüntü"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} gps için etiketlenecek bulundu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10005,4 +10036,576 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "Genel ayarları kullan."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "Yazarlar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "Kanal"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "KullanıcıAdı"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "şifre"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "Görüntüyü sağa dönder"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "Özellik Ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "Yazarlar"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "Lütfen bir kullanıcı adı giriniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "Lütfen bir kullanıcı adı giriniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+msgid "OAuth authorisation failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+#, fuzzy
+msgid "Access Token"
+msgstr "Erişim"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "İleri Tercihler"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+msgid "Enter the OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "Lütfen bir kullanıcı adı giriniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "Lütfen bir kullanıcı adı giriniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+msgid "Click to test the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "En azından bir nokta veya bir yol seç"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "''{0}'' için herhangi karşılık bulunamadı"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "Pencereyi kapat ve indirmeyi iptal et"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+msgid "Close the dialog and accept the Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "Tercihleri yükleyiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "Güncelleme İste"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurant"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+#, fuzzy
+msgid "Retrieve Access Token"
+msgstr "Acil Durum Noktası"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "Erişim"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "Bağlantı hatası."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "metin;metin;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10035,5 +10638,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10041,5 +10644,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10047,7 +10650,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "Silmek için bir satır seçiniz."
@@ -10489,12 +11092,4 @@
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "Backup dosyalarını sakla"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "Saklama sırasında backup dosyalarının sonuna ~ ekle"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10533,17 +11128,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Görünüm"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "Dil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "Varsayılan (Otomatik Seçilir)"
@@ -10610,10 +11200,19 @@
 msgstr "Eklenti sitelerini ayarla"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "Tercihleri varsayılan değerlere getir"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "Ayarları Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10621,29 +11220,29 @@
 msgstr "Programın görünüşünü değiştirmeye yarayan bir çok ayar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "Bağlantı Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "OSM server bağlantı ayarları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "Harita Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "Harita Projeksiyonu ve İnterpolasyon Ayarları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "Ses Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "Ses çalıcısı ve ses imleç ayarları."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız."
@@ -10670,86 +11269,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "İlginç Yerler"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "Proxy Ayarları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "OSM için asıl link"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "Asıl Link"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM şifresi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
 msgstr ""
 
@@ -11040,4 +11581,252 @@
 msgstr "Düzenleyici Grupları"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "Bağlantı hatası."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "Varsayılanı Kullan"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Backup dosyalarını sakla"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "Saklama sırasında backup dosyalarının sonuna ~ ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM kullanıcı_adı (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM şifresi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>UYARI: şifre konfigürasyon dosyasında düz metin olarak tutulmaktadır."
+"<br>şifre internet üzerinde aynı şekilde düz metin olarak gönderilmektedir. "
+"<br><b>Değerli bir şifre kullanmayınız.</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "Tercihler"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "Asıl Link"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "Onayla"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "Seçim varsayılan değer."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+msgid "Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11180,5 +11969,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11230,23 +12019,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11255,16 +12050,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
+"''{1}''."
 msgstr ""
 
@@ -11272,5 +12067,5 @@
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11278,5 +12073,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11512,5 +12307,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11554,5 +12349,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11600,30 +12395,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11782,4 +12577,19 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12077,23 +12887,28 @@
 "ediniz."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "{0} Okunuyor..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12474,5 +13289,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12481,5 +13296,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12489,5 +13304,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12497,5 +13312,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12504,5 +13344,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12511,5 +13351,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12518,9 +13358,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12529,5 +13369,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12537,5 +13377,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12544,5 +13384,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12551,5 +13391,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12558,10 +13398,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12570,10 +13410,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12584,5 +13424,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12592,5 +13432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12601,18 +13441,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12639,4 +13466,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13023,5 +13856,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13072,5 +13905,11 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13079,25 +13918,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr ""
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13106,13 +13943,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13120,34 +13957,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13159,18 +13996,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13178,5 +14015,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13184,44 +14021,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -13332,5 +14169,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13338,14 +14175,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13353,14 +14190,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13368,21 +14205,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13491,28 +14328,28 @@
 msgstr "Boş Tabaka"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13521,47 +14358,47 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "Kullan"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "Kullanmak için şema seçiniz."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "Renk Şeması"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "Silinecek şemayı seçiniz."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "listeden seçilen şemayı kullan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "Aktşf renkleri yeni renk şeması olarak kullan."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "Seçili şemayı sil."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "Renk Şeması"
@@ -13723,6 +14560,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "Yenile"
@@ -13951,33 +14788,33 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "doğu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "kuzeydoğu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "kuzey"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "kuzeybat"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "batı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "güneybatı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "güney"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "güneydoğu"
@@ -14017,5 +14854,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14026,80 +14863,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "su"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "Kıyı çizgisi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "yer"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "Her yol için max segment sayısı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "İlk iz için max nokta sayısı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Max gri seviyesi, su için (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "çizgi basitleştirme doğruluğu (derece)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Landsat mozaik çözünürlüğü (derece başına pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Landsat mozaik boyutu (pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "Bütün izleri doğuya taşı (derece)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "Bütün izleri kuzaye taşı (derece)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "Karaya doğru yön araması"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "Yolları şu şekilde etiketle"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS Tabakası"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "Max. Hafıza Boyutu (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "Max. Hafızada tutma (gün)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "Kaynak Metin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Oluşturulan yol için max. segment sayısı. Varsayılan 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14109,5 +14946,5 @@
 "Varsayılan 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14117,5 +14954,5 @@
 "arasıVarsayılan:90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14125,5 +14962,5 @@
 "değerler çok ve hassas nokta oluşturur. Varsayılan 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14132,45 +14969,45 @@
 "Varsayılan:4000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Landsat mozaik boyutu. Varsayılan 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Bütün noktaları doğuya hizala (derece). Varsayılan 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Bütün noktaları kuzeye hizala (derece). Varsayılan 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "Yer aramak için yön. Varsayılan Doğu."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Hangi WMS tabaksı iz takibi için kullanılsın."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Çalışma hafızası boyutu, byte olarak. Varsayılan 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Çalışma alanında saklanılan dosyaların max yaşı (gün).Varsayılan 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "Veri kaynak metni. Varsayılan landsat"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Landsat imajı üzerinde su alanını tespit eden eklenti."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Gölyürüyüşü eklentisi tercihleri"
@@ -14381,5 +15218,5 @@
 msgstr "OpenStreet Hata indirme döngüsü"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreet hatalarını göster"
@@ -14406,5 +15243,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14419,14 +15255,22 @@
 msgstr "Başlık çeşitli değerler taşır ve bir metine atanamaz."
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "OpenStreet Hatalarını Aç"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14434,22 +15278,31 @@
 msgstr "Görünen alan çok büyük veya çok küçük, indirmeye uygun değil"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "Yorum Ekle"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "Yorumunu Ekle"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+#, fuzzy
+msgid "Comment: "
+msgstr "Genel"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "Yapılmış olarak işaretle"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "Gerçekten Kapat?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14457,23 +15310,51 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "Kapat"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "Yeni konu"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "Konu oluştur"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "problemi detaylı olarak anlatınız"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "Alanları Oluştur"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "Lütfen bir kullanıcı adı giriniz"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "Bilinmeyen konu durumu"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "OpenStreet Hatalarını Aç"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14495,10 +15376,10 @@
 msgstr "Bilinmeyen Dosya Uzantısı: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14508,5 +15389,5 @@
 "ayarlarını yapınız"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox exe"
@@ -14516,37 +15397,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "API den veri yükle"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "Seçimi değiştir"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "Görünüm yerini değiştir"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "Uzak kontol hareketlerini, manual kontrol et"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "JOSM un diğer uygulamalar tarafında kontrol edilmesini sağlayan API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "Uzak Kontrol"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "Uzak kontrol eklenti ayarları."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14557,5 +15438,5 @@
 "uygulamaların eklenti ile haberleşmesi için kullanılır."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "Onaylanan Hareket"
@@ -14669,25 +15550,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr ""
@@ -14733,42 +15614,42 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr ""
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "Mozaik Kaynakları"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr ""
@@ -15000,37 +15881,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "Yoksay listesini kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "Yoksay listesini uyarıları saklamak için kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "Hata tabaksı kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "Problemli hataları göstermek için hata tabakasını kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "İstek üzerine"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "Yükleme"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15039,5 +15920,5 @@
 "OSM veri kontrol programı, kullanıcı veya program bazlı hataları ayrıştırır"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "Veri Onaylama"
@@ -15645,5 +16526,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "yapılar"
@@ -15657,5 +16538,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "alan"
@@ -16051,55 +16932,55 @@
 msgstr "Veri yüklemek için boş bir WMS tabakası aç"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "WMS Eklenti Tercihleri"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "WMS eklenti menusundeki, WMS server listesini değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "Menu İsmi"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS linki"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "Menu ismi (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS linki (Varsayılan)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "Menu ismi ve WMS linki kullanınız"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17637,6 +18518,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "araçyolu"
@@ -17662,6 +18543,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "ana_hat"
@@ -17687,6 +18568,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "birincil"
@@ -17712,6 +18593,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "ikincil"
@@ -17725,5 +18606,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "üçüncül"
@@ -17741,5 +18622,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "yerleşim_alanı"
@@ -17773,6 +18654,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "servis"
@@ -17806,6 +18687,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "inşaat"
@@ -17855,5 +18736,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "döner kavşak"
@@ -18839,5 +19720,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr "batak"
@@ -20236,7 +21117,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "sokak"
@@ -20964,28 +21845,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "spor"
@@ -22680,4 +23561,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22712,9 +23601,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "yeşil"
@@ -24122,7 +25011,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "bisiklet"
@@ -24192,7 +25081,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr "ayak"
@@ -24218,5 +25107,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr "metro"
@@ -24512,5 +25401,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr "kırılmış"
@@ -24552,5 +25441,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr "at"
@@ -24660,4 +25549,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24695,5 +25590,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24766,11 +25661,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24833,5 +25728,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24887,7 +25782,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr "araçyolu_hattı"
@@ -24958,9 +25853,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr "demiryolu"
@@ -25052,5 +25947,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25064,5 +25959,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25083,10 +25978,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr "döner kavşak"
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25096,5 +25991,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25109,5 +26004,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr "riverbank"
@@ -25121,5 +26016,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr "akış"
@@ -25133,5 +26028,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr "iskele"
@@ -25320,13 +26215,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr "insan yapımı"
@@ -25388,7 +26283,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr "demiryolu_noktası"
@@ -25411,10 +26306,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr "başka_demiryolu"
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr "demiryolu_üzeri"
@@ -25450,7 +26345,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr "eski_demiryolu"
@@ -25496,6 +26391,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr "havayolu"
@@ -25509,5 +26404,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr "terminal"
@@ -25529,5 +26424,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr "havayolu_ağır"
@@ -25541,5 +26436,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr "hafif_hafif"
@@ -25601,7 +26496,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr "havayolu"
@@ -25618,5 +26513,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr "basit_meydan"
@@ -25631,5 +26526,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr "orta_meydan"
@@ -25644,5 +26539,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr "büyük_meydan"
@@ -25657,5 +26552,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25670,5 +26565,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr "acemiKullanıcı_meydanı"
@@ -25683,5 +26578,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr "acemiKullanıcı_meydanı"
@@ -25801,11 +26696,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr "güç"
@@ -25819,5 +26714,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr "iskele"
@@ -25831,5 +26726,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr "suhattı"
@@ -25973,13 +26868,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr "dinlenme_yeri"
@@ -25993,5 +26888,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26087,10 +26982,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr "dinlenme_yeri"
@@ -26192,14 +27087,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr "tail_trafiği"
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26595,5 +27497,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26618,23 +27520,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr "eski_sokak_lambası"
@@ -26666,6 +27568,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr "su_lambası"
@@ -26726,8 +27628,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr "sağlık"
@@ -27080,26 +27982,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr "alışveriş"
@@ -27171,8 +28073,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr "hotel"
@@ -27243,5 +28145,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27250,5 +28152,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27258,5 +28160,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27265,5 +28167,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27273,9 +28175,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr "turizm"
@@ -27363,14 +28265,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr "tarihi"
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27379,5 +28280,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -27391,5 +28292,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -27411,5 +28312,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr "havza"
@@ -27423,5 +28324,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr "orman"
@@ -27435,5 +28336,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr "çiftlik"
@@ -27456,5 +28357,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr "perakende"
@@ -27468,5 +28369,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr "endüstri"
@@ -27480,5 +28381,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -27492,5 +28393,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -27504,5 +28405,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr "demiryolu"
@@ -27559,7 +28460,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr "askeri"
@@ -27573,5 +28474,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr "mezarlık"
@@ -27584,5 +28485,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr "zirve"
@@ -27597,5 +28498,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr "buzul"
@@ -27609,5 +28510,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr "volkanik"
@@ -27662,8 +28563,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr "doğal"
@@ -27677,5 +28578,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr "çalılık"
@@ -27689,5 +28590,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr "çalılık"
@@ -27701,5 +28602,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27713,5 +28614,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr "çamur"
@@ -27725,5 +28626,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr "sahil"
@@ -27801,8 +28702,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr "rut"
@@ -27825,4 +28726,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27850,7 +28792,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr "sınırlar"
@@ -28000,11 +28947,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr "yer"
@@ -28052,6 +28999,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr "adres"
@@ -28407,4 +29354,12 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "OSM için asıl link"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
+
 #~ msgid "Preparing..."
 #~ msgstr "Hazırlanıyor..."
@@ -28599,16 +29554,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "OSM için Login adı (email) ."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kullanıcı_adı (e-mail)"
-
-#~ 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>UYARI: şifre konfigürasyon dosyasında düz metin olarak "
-#~ "tutulmaktadır.<br>şifre internet üzerinde aynı şekilde düz metin olarak "
-#~ "gönderilmektedir. <br><b>Değerli bir şifre kullanmayınız.</b></html>"
 
 #~ msgid "Tagging preset source"
@@ -28826,12 +29769,6 @@
 #~ msgstr "TCX Dosyasını GPS izi olarak içeri al"
 
-#~ msgid "Validate"
-#~ msgstr "Onayla"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Aktif seçimi veya bütün veriyi onayla."
-
-#~ msgid "Request Update"
-#~ msgstr "Güncelleme İste"
 
 #~ msgid "error loading metadata"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 19246)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 19319)
@@ -5,4 +5,5 @@
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2009
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:381
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:306
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
@@ -11,6 +12,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 14:44+0100\n"
-"PO-Revision-Date: 2009-12-29 06:15+0000\n"
+"POT-Creation-Date: 2010-01-07 10:57+0100\n"
+"PO-Revision-Date: 2010-01-01 14:49+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -19,10 +20,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-01 13:22+0000\n"
+"X-Launchpad-Export-Date: 2010-01-07 08:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:208
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
@@ -89,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:109
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
@@ -118,5 +119,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:506
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
@@ -124,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -135,9 +136,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -176,5 +177,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
@@ -202,6 +202,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:70
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:722
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:724
@@ -294,4 +294,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
 msgid "Continue"
 msgstr "繼續"
@@ -322,5 +323,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
@@ -336,7 +337,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:338
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -468,6 +472,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -546,5 +551,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -558,5 +563,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
 msgid "Information"
 msgstr "資訊"
@@ -751,15 +756,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:682
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
 msgid "Delete"
 msgstr "刪除"
@@ -837,6 +842,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:46
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:48
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
@@ -1479,14 +1484,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Preferences..."
 msgstr "偏好設定..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-msgid "Open a preferences page for global settings."
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+#, fuzzy
+msgid "Open a preferences dialog for global settings."
 msgstr "開啟偏好全域設定設定頁面"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
 msgid "Preferences"
 msgstr "偏好設定"
@@ -1627,17 +1633,17 @@
 msgstr "求助：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117
 msgid "Status Report"
 msgstr "狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
 msgstr "複製到剪貼簿並關閉"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 #: ../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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:927
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1767,43 +1773,43 @@
 msgstr "這個節點並未黏合到其他項目上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "這些節點沒有一個黏合到其他項目上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "這個路徑的節點沒有一個黏合到其他項目上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "目前的選擇區域不能用於取消黏合。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "選擇其一："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* 一個有標籤的節點，或"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* 一個用於多條路徑的節點，或"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* 一個用於多條路徑或用於那些路徑之一的節點，或"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* 一個有一或更多節點用於多條路徑的路徑，或"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "* 一個路徑且其一或多個節點用於多條路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1816,9 +1822,9 @@
 "都會被選取。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "取消黏合節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1826,5 +1832,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1989,4 +1995,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:365
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:274
 msgid "Back"
 msgstr "返回"
@@ -3194,24 +3202,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "偏好設定儲存於 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "無法上傳偏好設定。理由：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
 msgstr "無法從伺服器載入偏好設定。"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr "錯誤：伺服器的書籤清單中有未預期的行「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
 msgid ""
@@ -3220,5 +3228,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
 msgid ""
@@ -3229,6 +3237,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
-msgid "Failed to load load resource ''{0}''. Error is {1}"
-msgstr "無法讀取載入資源「{0}」。錯誤為 {1}"
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3641,6 +3649,6 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3805,5 +3813,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:257
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3818,10 +3826,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
 msgid "highway"
 msgstr "公路"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
 #: build/trans_presets.java:3189
 msgid "railway"
@@ -3829,15 +3837,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:313
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
 msgid "waterway"
 msgstr "航道"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:314
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
 msgid "landuse"
 msgstr "土地利用"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
@@ -3849,6 +3857,11 @@
 msgstr[0] "{0} 節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#, fuzzy
+msgid "public transport"
+msgstr "大眾運輸"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
 #, java-format
 msgid "{0} member"
@@ -3856,5 +3869,5 @@
 msgstr[0] "{0} 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:205
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3896,9 +3909,19 @@
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:248
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "驗證"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:264
+#, fuzzy
+msgid "Authorisation Failed"
+msgstr "連線失敗"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:283
 msgid "Unknown host"
 msgstr "不明的主機"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:386
 msgid "Object deleted"
 msgstr "物件已刪除"
@@ -4002,65 +4025,65 @@
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:73
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "開啟檔案(若為 .gpx 則是原始 gps)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Set the language."
 msgstr "設定語言。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options provided as Java system properties"
 msgstr "選項提供為 Java 系統屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Change the folder for all user settings"
 msgstr "改變所有使用者設定值的資料夾"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4071,9 +4094,9 @@
 "      Java 選項來增加分配記憶體的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4083,25 +4106,25 @@
 "--selection 前載入某些資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "要取代 --download=<bbox> 可以指定 osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
 msgid "Activating updated plugins"
 msgstr "使用更新後的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4114,5 +4137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4121,5 +4144,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:642
@@ -4227,5 +4250,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:128
 msgid "User:"
 msgstr "使用者："
@@ -4892,5 +4915,5 @@
 #: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:194
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4905,5 +4928,5 @@
 #: ../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:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
@@ -4911,5 +4934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
@@ -4999,5 +5022,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "none"
 msgstr "沒有"
@@ -5175,5 +5198,5 @@
 "to <strong>keep</strong> the first way and <strong>remove</strong> the other "
 "ways that are members of the same relation: the combined way will take the "
-"place of the original way in the membership.</html>"
+"place of the original way in the relation.</html>"
 msgstr ""
 
@@ -5185,5 +5208,5 @@
 "to <strong>keep</strong> the first node and <strong>remove</strong> the "
 "other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the membership.</html>"
+"the place of the original node in the relation.</html>"
 msgstr ""
 
@@ -5280,5 +5303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
@@ -5287,5 +5310,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
@@ -5366,13 +5389,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
 msgid "Add"
 msgstr "加入"
@@ -5503,54 +5526,54 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
 #: build/trans_presets.java:3154
 msgid "Relations"
 msgstr "關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 msgid "Open a list of all relations."
 msgstr "開啓所有關係的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
 #, java-format
 msgid "Relations: {0}"
 msgstr "關係：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
 msgid "Open an editor for the selected relation"
 msgstr "開啓選取的關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
 msgid "Delete the selected relation"
 msgstr "刪除選取的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
 msgid "Create a new relation"
 msgstr "建立新的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:418
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
 msgid "Set the current selection to the list of selected relations"
 msgstr "將目前的選擇區域設定到選取關係的清單"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
 msgid "Select the members of all selected relations"
 msgstr "選擇所有已選取關係的成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
 msgid "Select members"
 msgstr "選擇成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
 msgid "Download all members of the selected relations"
 msgstr "下載已選取關係的所有成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
 msgid "Download members"
 msgstr "下載成員"
@@ -6884,58 +6907,58 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
 msgid ""
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:459
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
 msgid ""
 "Can't restrict changeset query to the current user because the current user "
@@ -6943,58 +6966,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID isn''t valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Can''t restrict the changeset query to the user name ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:556
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:658
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:692
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
 msgid "Date: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:686
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:716
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:788
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
 msgid ""
 "Can't build changeset query with time based restrictions. Input isn't valid."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
 msgid ""
 "<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7002,9 +7025,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
 msgid ""
 "Can''t restrict the changeset query to a specific bounding box. The input is "
@@ -7012,5 +7035,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
 msgid ""
 "<html>Please enter valid longitude/latitude values to restrict<br>the "
@@ -7018,15 +7041,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:956
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1013
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
 msgid ""
 "The current value isn't a valid user ID. Please enter an integer value > 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
 msgid ""
 "<html>The  current value isn't a valid user name.<br>Please enter an non-"
@@ -7034,9 +7057,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
 msgid ""
@@ -7045,5 +7068,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
 #, java-format
 msgid ""
@@ -7070,9 +7093,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:174
 msgid "Basic"
 msgstr "基本"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
-msgid "Download changesets using a predefined queries"
+msgid "Download changesets using predefined queries"
 msgstr ""
 
@@ -7082,5 +7106,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
-msgid "Query changesets according to an URL of the OSM server"
+msgid "Query changesets from a server URL"
 msgstr ""
 
@@ -7091,5 +7115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
-msgid "Query changesets according to advanced query parameters"
+msgid "Use a custom changeset query"
 msgstr ""
 
@@ -7131,22 +7155,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:69
-#, java-format
-msgid ""
-"<html><body>Please enter or paste an URL to retrieve changesets from the OSM "
-"API.<p><strong>Examples</strong></p><ul><li><a href=\"http://www."
-"openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/"
-"browse/changesets?open=true</a></li><li><a href=\"http://api.openstreetmap."
-"org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/"
-"changesets?open=true</a></li></ul>Note that changeset queries are currently "
-"always submitted to ''{0}'', regardless of the host, port and path of the "
-"URL entered beow.</body></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:181
 msgid "This changeset query URL is invalid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:179
 #, java-format
 msgid "This will change {0} object."
@@ -7154,10 +7180,10 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 msgid "An empty value deletes the tag."
 msgstr "空白的數值代表刪除該標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:272
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:517
@@ -7166,10 +7192,10 @@
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:229
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:361
 msgid "Change values?"
 msgstr "是否改變數值？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7177,5 +7203,5 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
 #, java-format
 msgid "This will change up to {0} object."
@@ -7183,9 +7209,9 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:336
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:349
 msgid "Please select a value"
 msgstr "請選擇一個數值"
@@ -7213,61 +7239,57 @@
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:790
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:830
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:893
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:938
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation"
-msgstr "刪除 {0} 個關係"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 msgid "Select relation in main selection."
-msgstr "尚未選取關係"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select in relation list"
-msgstr "選擇線條繪製選項"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Select relation in relation list."
-msgstr "選擇線條繪製選項"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -7323,5 +7345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:111
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -7334,11 +7356,11 @@
 msgstr[0] "正下載關係「{1}」的 {0} 不完整子項目"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:44
 msgid "Download relations"
 msgstr "下載關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, java-format
-msgid "({0}/{1}: Downloading relation ''{2}''..."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:80
+#, fuzzy, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
 msgstr "({0}/{1}: 正在下載關係「{2}」..."
 
@@ -7967,6 +7989,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:231
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:119
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:217
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:327
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -9032,6 +9055,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
 #, java-format
-msgid "There is {0} object to upload left."
-msgid_plural "There are {0} objects to upload left."
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
 msgstr[0] ""
 msgstr[1] ""
@@ -9118,9 +9141,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
 "<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What policy shall be used?</html>"
+"upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
 
@@ -9142,4 +9164,11 @@
 "<html>Can''t upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -9566,24 +9595,24 @@
 msgstr[0] "{0} 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX 檔案 (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "檔案 {0} 已經以「{1}」的名稱載入了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:188
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "當解析 {0} 時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:197
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "不能讀取 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:236
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9594,34 +9623,34 @@
 "據您讀取到的相片時刻並選擇時區<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:254
 msgid "Photo time (from exif):"
 msgstr "相片時刻 (取自 exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
 msgid "Gps time (read from the above photo): "
 msgstr "Gps 時刻（自上列相片讀取）： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:281
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:289
 msgid "I'm in the timezone of: "
 msgstr "我所在的時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:388
 msgid "No date"
 msgstr "沒有日期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:362
 msgid "Open an other photo"
 msgstr "開啟其他相片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:401
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:402
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "從 GPS 接收器的相片同步時間"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:415
 msgid ""
 "Error while parsing the date.\n"
@@ -9631,114 +9660,116 @@
 "請使用要求的格式"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid "Invalid date"
 msgstr "無效的日期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:462
 msgid "<No GPX track loaded yet>"
 msgstr "<尚未載入 GPX 軌跡>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:466
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "GPX track: "
 msgstr "GPX 軌跡： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:474
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:475
 msgid "Open another GPX trace"
 msgstr "開啟另一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:505
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
 msgid "Auto-Guess"
 msgstr "自動猜測"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:522
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:531
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:555
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
 msgid "Timezone: "
 msgstr "時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:567
 msgid "Offset:"
 msgstr "位移："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:650
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:666
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
 msgid "Correlate images with GPX track"
 msgstr "將圖片與 GPX 軌跡關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:668
 msgid "Correlate"
 msgstr "關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:694
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
 msgid "Invalid timezone"
 msgstr "無效的時區"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:702
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
 msgid "Invalid offset"
 msgstr "無效的移位"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:712
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
 #, java-format
 msgid "Timezone: {0}"
 msgstr "時區：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:862
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:863
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:880
-#, java-format
-msgid "<br>(Time difference of {0} days)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:907
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:881
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:908
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9746,38 +9777,38 @@
 msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:909
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:910
 msgid "Matching photos to track failed"
 msgstr "比對相片至軌跡失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:925
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:926
 msgid "Adjust timezone and offset"
 msgstr "調整時區並補償"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
 msgid "The selected photos don't contain time information."
 msgstr "選取的相片未包含時刻資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:946
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
 msgid "Photos don't contain time information"
 msgstr "相片未包含時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:976
 msgid "GPX Track has no time information"
 msgstr "GPX 軌跡沒有時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
 msgid "You should select a GPX track"
 msgstr "您應該選擇一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1071
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1072
 msgid "No selected GPX track"
 msgstr "沒有選取的 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1245
 #, java-format
 msgid ""
@@ -9788,5 +9819,5 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1315
 #, java-format
 msgid ""
@@ -9797,78 +9828,78 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
 msgid "Extracting GPS locations from EXIF"
 msgstr "從 EXIF 中解出 GPS 位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
 msgstr "開始掃描目錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
 msgstr "讀取相片..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
 #, java-format
 msgid "Reading {0}..."
 msgstr "正在讀取 {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "無法取得目錄  {0} 的路徑\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "正在掃描目錄 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "在目錄 {0} 找到空的檔案\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
 msgid "Correlate to GPX"
 msgstr "關聯到 GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
 msgid "image"
 msgid_plural "images"
 msgstr[0] "圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "已發現 {0} 具有 GPS 標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
-#, java-format
-msgid ""
-"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
-"permanently lost!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10053,4 +10084,581 @@
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
+msgid "Access Token Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
+msgid "Access Token Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+#, fuzzy
+msgid "Use default settings"
+msgstr "使用全域設定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:236
+#, fuzzy
+msgid "Autorise URL:"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+#, fuzzy
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "點選以放棄合併節點"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:64
+#, fuzzy
+msgid "Manual"
+msgstr "運河"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorises the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:112
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+#, fuzzy
+msgid "Username: "
+msgstr "使用者名稱"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:127
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+#, fuzzy
+msgid "Password: "
+msgstr "密碼："
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:175
+#, fuzzy
+msgid "Granted rights"
+msgstr "向右旋轉"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:176
+#, fuzzy
+msgid "Advanced OAuth properties"
+msgstr "加入屬性"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:236
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:357
+msgid "Accept Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:237
+#, java-format
+msgid ""
+"<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:333
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
+#, fuzzy
+msgid "Authorise now"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:335
+msgid "Click to redirect you to the authorisation form on the JOSM web site"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:366
+msgid "Run the automatic authorisation steps again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:380
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
+msgid "Test Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:409
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+#, fuzzy
+msgid "Please enter your OSM user name"
+msgstr "請輸入使用者名稱"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:411
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name can't be empty. Please enter your OSM user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:430
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+#, fuzzy
+msgid "Please enter your OSM password"
+msgstr "請輸入使用者名稱"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:432
+msgid "The password can't be empty. Please enter your OSM password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:442
+msgid "Authorise JOSM to access the OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:456
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorisation process,<br>i.e. semi-automatic or manual authorisation.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:463
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:480
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:505
+#, fuzzy
+msgid "OAuth authorisation failed"
+msgstr "API 初始化失敗"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:472
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM wasn't able to build<br>a valid login URL "
+"from the OAuth Autorise Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:57
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:141
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorised to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:99
+msgid "Save Access Token to preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:120
+msgid "Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:121
+#, fuzzy
+msgid "Advanced OAuth parameters"
+msgstr "進階的偏好設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:123
+#, fuzzy
+msgid "Enter the OAuth Access Token"
+msgstr "請輸入搜尋語詞"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:124
+msgid "Enter advanced OAuth properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:179
+#, fuzzy
+msgid "Please enter an Access Token Key"
+msgstr "請輸入使用者名稱"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:181
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:199
+#, fuzzy
+msgid "Please enter an Access Token Secret"
+msgstr "請輸入使用者名稱"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:201
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java:235
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:438
+#, fuzzy
+msgid "Click to test the Access Token"
+msgstr "點選以取消目前的操作"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:121
+#, fuzzy
+msgid "Please select an authorisation procedure: "
+msgstr "請選擇至少一個節點或路徑。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:239
+#, fuzzy, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "找不到「{0}」的符合項"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:340
+#, fuzzy
+msgid "Close the dialog and cancel authorisation"
+msgstr "關閉對話盒並取消下載"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java:359
+#, fuzzy
+msgid "Close the dialog and accept the Access Token"
+msgstr "關閉此對話盒並建立新的節點"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:99
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:102
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:105
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:129
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:162
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:299
+#, java-format
+msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:350
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:437
+#, fuzzy, java-format
+msgid "Failed to autorise OAuth request  ''{0}''"
+msgstr "警告：將偏好設定固定為「{0}」失敗"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:484
+#, java-format
+msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:486
+msgid "Initializing a session at the OSM website..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:492
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:498
+#, java-format
+msgid "Authorising request token ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java:504
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+#, fuzzy
+msgid "Allow to read your preferences"
+msgstr "上傳偏好設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+#, fuzzy
+msgid "Request Failed"
+msgstr "要求更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
+msgid "Display Advanced OAuth Parameters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:369
+msgid "Retrieve Request Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr "<html>點選 <strong>{0}</strong> 開始合併我和他們的項目</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:205
+msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:228
+msgid "Request Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:220
+#, java-format
+msgid ""
+"<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
+"launching an authorisation page in an external browser. Please login with "
+"your OSM username and password and follow the instructions to authorise the "
+"Request Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorise URL and paste it into the address field of your browser."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:349
+msgid "Go back to step 1/3"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:306
+msgid ""
+"<html><body>JOSM has successfully retrieved an Access Token. You can now "
+"accept this token. JOSM will used it the future for authentication and "
+"authorisation at the OSM server.<br><br>The access token is: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:348
+#, fuzzy
+msgid "Restart"
+msgstr "餐廳"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:371
+#, fuzzy
+msgid "Click to retrieve a Request Token"
+msgstr "按這裡刪除目的地。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:402
+msgid "Retrieve Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java:404
+#, fuzzy
+msgid "Click to retrieve an Access Token"
+msgstr "按這裡刪除目的地。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the the Access Token ''{0}'' to<br>access the OSM "
+"server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' with "
+"id ''{3}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+#, fuzzy
+msgid "Success"
+msgstr "來源"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorised. You will "
+"not<br>able to access any protected resource on this server using this token."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+#, fuzzy
+msgid "Test failed"
+msgstr "更新失敗"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current userfrom the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM couldn''t decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+#, fuzzy
+msgid "Retrieving user info..."
+msgstr "字串;字串;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -10083,5 +10691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
 msgid "Please select the row to edit."
@@ -10089,5 +10697,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
 #, java-format
 msgid "New value for {0}"
@@ -10095,7 +10703,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
 msgid "Please select the row to delete."
 msgstr "請選擇要刪除的列。"
@@ -10531,12 +11139,4 @@
 msgstr "OSM 資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:27
-msgid "Keep backup files"
-msgstr "保留備份檔案"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:32
-msgid "When saving, keep backup files ending with a ~"
-msgstr "儲存時，在備份檔案名稱的結尾加上 ~"
-
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
@@ -10575,17 +11175,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "外觀與感覺"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:47
 msgid "Language"
 msgstr "語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
-msgid "Looking up available translations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:108
 msgid "Default (Auto determined)"
 msgstr "預設值（自動決定）"
@@ -10652,10 +11247,20 @@
 msgstr "設定外掛程式網站"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#, fuzzy
+msgid "Close the prefereces dialog and discard preference updates"
+msgstr "關閉此對話盒並建立新的節點"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#, fuzzy
+msgid "Save the preferences and close the dialog"
+msgstr "取消更新並關閉此對話盒"
+
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid "Display Settings"
 msgstr "顯示設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:45
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -10663,29 +11268,29 @@
 msgstr "各種影響整個程式視覺呈現的設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings"
 msgstr "連線設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:46
 msgid "Connection Settings for the OSM server."
 msgstr "OSM 伺服器的連線設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Map Settings"
 msgstr "地圖設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:47
 msgid "Settings for the map projection and data interpretation."
 msgstr "地圖投影與資料轉譯設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Audio Settings"
 msgstr "音效設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:48
 msgid "Settings for the audio player and audio markers."
 msgstr "音效播放程式與音效標記的設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:108
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
@@ -10712,91 +11317,29 @@
 msgstr "無法使用投影法 {0}。改用麥卡托投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:93
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:144
-msgid "Host:"
-msgstr "主機："
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:100
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:151
-msgctxt "server"
-msgid "Port:"
-msgstr "連接埠："
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:112
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr "如果您的代理伺服器需要驗證，請輸入使用者名稱和密碼。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:127
-msgid "Password:"
-msgstr "密碼："
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:187
-msgid "No proxy"
-msgstr "不使用代理伺服器"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:200
-msgid "Use standard system settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:214
-msgid "Manually configure a HTTP proxy"
-msgstr "手動設定 HTTP 代理伺服器"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:231
-msgid "Use a SOCKS proxy"
-msgstr "使用 SOCKS 代理伺服器"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:271
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-"警告：JOSM 是設定為使用系統設定的代理伺服器，但是 JVM 並未設定為可以取得它"
-"們。將偏好設定重設為「不使用代理伺服器」"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:296
-msgid "Proxy Settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+#, fuzzy
+msgid "Authentication"
+msgstr "驗證"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+#, fuzzy
+msgid "Proxy settings"
 msgstr "代理伺服器設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
-msgid "The base URL for the OSM server (REST API)"
-msgstr "OSM 伺服器 (REST API) 的基礎 URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
-msgid "Login name (e-mail) to the OSM account."
-msgstr "OSM 帳號的登入名稱 (e-mail)。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
-msgid "Base Server URL"
-msgstr "基礎伺服器 URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
-msgid "OSM username (e-mail)"
-msgstr "OSM 使用者名稱 (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
-msgid "OSM password"
-msgstr "OSM 密碼"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
-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>警告：此密碼是以純文字的方式儲存於偏好設定檔案中。<br>密碼也是在 URL 中"
-"以純文字的方式傳送到伺服器。<br><b>請勿使用重要的密碼。</b></html>"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -11080,4 +11623,256 @@
 msgstr "修飾鍵群組"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+#, fuzzy
+msgid "Connection to API failed"
+msgstr "連線失敗。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' didn''t return a valid response.<br>It "
+"is likely that ''{0}'' isn''t an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+#, fuzzy
+msgid "Use Basic Authentication"
+msgstr "驗證"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+#, fuzzy
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr "以指定的使用者名稱和密碼進行驗證"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "Use OAuth"
+msgstr "使用預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "保留備份檔案"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "儲存時，在備份檔案名稱的結尾加上 ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+#, fuzzy
+msgid "OSM username:"
+msgstr "OSM 使用者名稱 (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+#, fuzzy
+msgid "OSM password:"
+msgstr "OSM 密碼"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+#, fuzzy
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html>警告：此密碼是以純文字的方式儲存於偏好設定檔案中。<br>密碼也是在 URL 中"
+"以純文字的方式傳送到伺服器。<br><b>請勿使用重要的密碼。</b></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:112
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:134
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
+msgid ""
+"You don't have an Access Token yet to access the OSM server using OAuth. "
+"Please authorise first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
+#, fuzzy
+msgid "Save to preferences"
+msgstr "偏好設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Click to step through the OAuth authorisation process"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
+msgid "New Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid ""
+"Click to step through the OAuth authorisation process and generate a new "
+"Access Token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:87
+#, fuzzy
+msgid "OSM Server URL:"
+msgstr "基礎伺服器 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:151
+msgid "Validate"
+msgstr "檢驗"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Test the API URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:168
+msgid "The API URL is valid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:173
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:234
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:238
+#, fuzzy
+msgid "The current value isn't a valid URL"
+msgstr "目前的數值是預設值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:240
+#, fuzzy
+msgid "Please enter the OSM API URL."
+msgstr "請重新啟動 JOSM。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:158
+msgid "Host:"
+msgstr "主機："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:165
+msgctxt "server"
+msgid "Port:"
+msgstr "連接埠："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:121
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr "如果您的代理伺服器需要驗證，請輸入使用者名稱和密碼。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:136
+msgid "Password:"
+msgstr "密碼："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:204
+msgid "No proxy"
+msgstr "不使用代理伺服器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:216
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:218
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "Manually configure a HTTP proxy"
+msgstr "手動設定 HTTP 代理伺服器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:248
+msgid "Use a SOCKS proxy"
+msgstr "使用 SOCKS 代理伺服器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:290
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+"警告：JOSM 是設定為使用系統設定的代理伺服器，但是 JVM 並未設定為可以取得它"
+"們。將偏好設定重設為「不使用代理伺服器」"
+
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -11219,5 +12014,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
@@ -11269,27 +12064,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
-#, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-"Proxy won't be used."
-msgstr ""
-"在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代理"
-"伺服器。"
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
-#, java-format
-msgid ""
-"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-msgstr ""
-"在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺服"
-"器。"
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
-#, java-format
-msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-msgstr "警告：找不到偏好設定「{0}」。將不使用代理伺服器。"
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
 msgid ""
@@ -11300,26 +12097,22 @@
 "器。"
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-"警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使用"
-"代理伺服器"
-
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
 msgid ""
 "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''. Proxy won't be used"
-msgstr ""
-"警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使用"
-"代理伺服器"
+"''{1}''."
+msgstr ""
 
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
 #.
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
 msgid ""
@@ -11327,5 +12120,5 @@
 msgstr "錯誤：以代理伺服器「{0}」連線到 URI「{1}」失敗。例外為：{2}"
 
-#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
 msgid ""
 "Warning: the JVM is not configured to lookup proxies from the system "
@@ -11561,5 +12354,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
 #, java-format
-msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
 msgstr ""
 
@@ -11603,5 +12396,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -11649,30 +12442,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:536
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
-msgid "Current changeset is null. Can't upload data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:638
+msgid "Current changeset is null. Cannot upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:640
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
 #, java-format
 msgid "(Code={0})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
 #, java-format
 msgid "The server replied an error with code {0}."
@@ -11831,4 +12624,21 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:120
+msgid ""
+"Failed to add an OAuth authentication header. There is currently no OAuth "
+"Access Token configured."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, fuzzy, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"警告：發現未預期的偏好設定「{0}」數值。得到的數值是「{1}」。將不使用代理伺服"
+"器。"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
@@ -12124,23 +12934,28 @@
 msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
-#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:127
+#, fuzzy
+msgid "Reading user info ..."
+msgstr "正在讀取 {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:77
@@ -12515,5 +13330,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -12522,5 +13337,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
 msgid ""
@@ -12530,5 +13345,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:84
 #, java-format
 msgid ""
@@ -12538,5 +13353,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
+#, fuzzy, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html>在 HTTP 代理伺服器「{0}」驗證失敗。請輸入有效的使用者名稱和密碼。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:102
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:112
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
 #, java-format
 msgid ""
@@ -12545,5 +13387,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
 #, java-format
 msgid ""
@@ -12552,5 +13394,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:163
 #, java-format
 msgid ""
@@ -12559,9 +13401,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:169
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
 #, java-format
 msgid ""
@@ -12570,5 +13412,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
 #, java-format
 msgid ""
@@ -12578,5 +13420,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
 #, java-format
 msgid ""
@@ -12585,5 +13427,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid ""
@@ -12592,5 +13434,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:273
 #, java-format
 msgid ""
@@ -12599,10 +13441,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:287
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:290
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -12611,10 +13453,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:293
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:307
 #, java-format
 msgid ""
@@ -12625,5 +13467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:334
 #, java-format
 msgid ""
@@ -12633,5 +13475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid ""
@@ -12642,18 +13484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:98
-msgid "Loading available locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:102
-msgid "Checking locales..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:105
-#, java-format
-msgid "Checking translation for locale ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:171
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:339
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -12680,4 +13509,10 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
 msgstr ""
 
@@ -13064,5 +13899,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:416
 msgid "Select Feuille"
 msgstr ""
@@ -13113,5 +13948,11 @@
 msgstr "CadastreGrabber: 不合法的 url。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
 #, java-format
 msgid ""
@@ -13120,25 +13961,23 @@
 msgstr ""
 
-#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:384
+msgid "Choose from..."
+msgstr "選擇自..."
+
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
-msgid "Choose from..."
-msgstr "選擇自..."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:149
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:158
 msgid "Auto sourcing"
 msgstr "自動來源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -13150,13 +13989,13 @@
 "您是否想要回復以 F11 作為抓取動作？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "Restore grab shortcut F11"
 msgstr "回復抓取捷徑鍵 F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:221
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM 已停止以便讓變更生效。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:283
 #, java-format
 msgid ""
@@ -13164,34 +14003,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
 msgstr "以 JOSM 背景顏色取代原始背景。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "反轉灰色（用於黑色背景）。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Set background transparent."
 msgstr "設定背景透明度。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
 msgstr "繪出已下載資料的邊界。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Enable automatic caching."
 msgstr "啟用自動快取。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Max. cache size (in MB)"
 msgstr "最大快取容量 (MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -13203,18 +14042,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "French cadastre WMS"
 msgstr "法國 cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>當自動來源啓用時設定鍵「source」的數值</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
 msgstr "來源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -13222,5 +14061,5 @@
 msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -13228,44 +14067,44 @@
 msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:104
 msgid "Allows multiple layers stacking"
 msgstr "允許多重圖層堆疊"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr "設定 WMS 圖層透明度。右邊是不透明，左邊是透明。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:120
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "在從 WMS 伺服器下載的資料周圍繪出一個矩形。"
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "抓取較小的圖片（較高的品質但消耗更多記憶體）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:150
 msgid "Fixed size square (default is 100m)"
 msgstr "固定大小矩形（預設為 100m）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:170
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "固定大小（從 25 到 100 公尺）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:189
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "當超過這個大小時較舊的檔案會自動刪除"
@@ -13378,5 +14217,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:172
 msgid ""
 "Click first corner for image cropping\n"
@@ -13384,14 +14223,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:191
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:211
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -13399,14 +14238,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:230
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:248
 msgid ""
 "Do you want to cancel completely\n"
@@ -13414,21 +14253,21 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:267
 msgid "East"
 msgstr "東"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid "North"
 msgstr "北"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -13541,28 +14380,28 @@
 msgstr "空白圖層"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:198
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS 圖層 ({0})，已載入 {1} 個拼貼"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:200
 msgid "Is not vectorized."
 msgstr "並非向量化的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:194
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:201
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:196
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:203
 msgid "Is vectorized."
 msgstr "是向量化的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:204
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:399
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:406
 #, java-format
 msgid ""
@@ -13573,47 +14412,47 @@
 "建立一個新的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:407
 msgid "Cache Format Error"
 msgstr "快取格式錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:422
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:429
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:431
 msgid "Cache Lambert Zone Error"
 msgstr "快取蘭勃特區發生錯誤"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
 msgstr "使用"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:71
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Please select a scheme to use."
 msgstr "請選擇要使用的配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:81
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
 msgid "Color Scheme"
 msgstr "色彩配置"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:95
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 msgid "Please select the scheme to delete."
 msgstr "請選擇要刪除的配置。"
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:107
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
 msgid "Use the selected scheme from the list."
 msgstr "使用從清單選取的配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
 msgid "Use the current colors as a new color scheme."
 msgstr "使用目前的顏色作為新的顏色配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
 msgid "Delete the selected scheme from the list."
 msgstr "從清單中刪除選取的配置。"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:111
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Color Schemes"
 msgstr "顏色配置"
@@ -13777,6 +14616,6 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:115
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
 msgid "Refresh"
 msgstr "重新整理"
@@ -14005,33 +14844,33 @@
 msgstr "發生不明的錯誤"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "east"
 msgstr "東"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northeast"
 msgstr "東北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "north"
 msgstr "北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
 msgid "northwest"
 msgstr "西北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "west"
 msgstr "西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southwest"
 msgstr "西南"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "south"
 msgstr "南"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "southeast"
 msgstr "東南"
@@ -14071,5 +14910,5 @@
 #. <rule>
 #. <condition k="natural" v="water"/>
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="nautical/water.png"/>
 #. color water
 #. <scale_min>1</scale_min>
@@ -14080,80 +14919,80 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2337 build/trans_style.java:961
-#: build/trans_style.java:978 build/trans_style.java:994
-#: build/trans_style.java:3415 build/trans_style.java:3423
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: build/trans_presets.java:2337 build/trans_style.java:967
+#: build/trans_style.java:984 build/trans_style.java:1000
+#: build/trans_style.java:3435 build/trans_style.java:3443
 msgid "water"
 msgstr "水域"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "coastline"
 msgstr "海岸線"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
 msgid "land"
 msgstr "陸地"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
 msgid "Maximum number of segments per way"
 msgstr "每路徑的最大區段數"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
 msgid "Maximum number of nodes in initial trace"
 msgstr "初始化軌跡的最大節點數"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "判斷為水域的最大灰色值 (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
 msgid "Line simplification accuracy (degrees)"
 msgstr "線條簡化準確度（度）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Landsat 拼貼的解析度（每一度的像素）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Landsat 拼貼的大小（像素）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
 msgid "Shift all traces to east (degrees)"
 msgstr "所有軌跡向東平移（度）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
 msgid "Shift all traces to north (degrees)"
 msgstr "所有軌跡向北平移（度）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
 msgid "Direction to search for land"
 msgstr "搜尋陸地的方向"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
 msgid "Tag ways as"
 msgstr "將路徑標記為"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
 msgid "WMS Layer"
 msgstr "WMS 圖層"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
 msgid "Maximum cache size (MB)"
 msgstr "最大快取大小 (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
 msgid "Maximum cache age (days)"
 msgstr "最大快取留存時間（天）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
 msgid "Source text"
 msgstr "來源文字"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "在每個產生的路徑中允許的最大區段數。預設為 250。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14161,5 +15000,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -14169,5 +15008,5 @@
 "為 90。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14177,50 +15016,50 @@
 "節點，和更準確的線條。預設值為 0.0003。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Landsat 拼貼的解析度，以每一度像素為測量單位。預設值為 4000。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "一個 landsat 拼貼的大小，以像素為測量單位。預設值為 2000。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "所有點向東方移位（度）。預設值為 0。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "所有點向北方移位（度）。預設值為 0。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Direction to search for land. Default east."
 msgstr "搜尋陸地方向。預設值為東方。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "將路徑加上標籤成為水域、海岸線、陸地或都不是。預設值為水域。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "再次追蹤時要使用的 WMS 圖層。預設值為 IR1。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "每個快取目錄的最大容量(位元組)。預設值為 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "每個快取檔案留存的最大天數。預設值為 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Data source text. Default is Landsat."
 msgstr "資料來源文字。預設值為 Landsat。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "用來追蹤 Landsat 圖庫中水域的外掛程式。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakewalker 外掛程式偏好設定"
@@ -14430,5 +15269,5 @@
 msgstr "OpenStreetBugs 下載迴圈"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "顯示 OpenStreetBugs 議題"
@@ -14457,5 +15296,4 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
 #, java-format
 msgid "An error occurred: {0}"
@@ -14470,14 +15308,22 @@
 msgstr "標頭包含許多數值而且不能對映為單一字串"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
+msgid "Process queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:105
 msgid "Open OpenStreetBugs"
 msgstr "開啟 OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr "開啟 OpenStreetBugs 視窗並使用自動下載"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
+msgid "Bug list"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
 msgid ""
 "The visible area is either too small or too big to download data from "
@@ -14485,22 +15331,30 @@
 msgstr "可視區域可能太小或太大以致無法從 OpenStreetBugs 下載資料"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:178
+msgid "Queue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
 msgstr "加入評論"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
 msgstr "輸入您的評論"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
 msgstr "標記為完成"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
 msgid "Really close?"
 msgstr "真的要結案嗎？"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
 msgid ""
 "<html>Really mark this issue as ''done''?<br><br>You may add an optional "
@@ -14510,23 +15364,51 @@
 "html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+#, fuzzy
+msgid "Close: "
+msgstr "關閉"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
 msgstr "新增議題"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
 msgstr "建立議題"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
 msgstr "明確的描述此問題"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+#, fuzzy
+msgid "Create: "
+msgstr "關聯"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
 msgstr "請輸入使用者名稱"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:49
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
 msgstr "不明的議題狀態"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+#, fuzzy
+msgid "OpenStreetBugs"
+msgstr "開啟 OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -14548,10 +15430,10 @@
 msgstr "不明的延伸檔名：{0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:138
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -14559,5 +15441,5 @@
 msgstr "找不到 Firefox。請在偏好設定的地圖設定頁面設定 firefox 執行檔。"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:134
 msgid "Firefox executable"
 msgstr "Firefox 可執行檔"
@@ -14567,37 +15449,37 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
 msgstr "從 API 載入資料"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "create new objects"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "change the selection"
 msgstr "改變選擇區域"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
 msgstr "改變檢視連接埠"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
 msgid "confirm all Remote Control actions manually"
 msgstr "手動確認所有的遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "允許 JOSM 被其他應用程式控制的外掛程式。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Remote Control"
 msgstr "遠端控制"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "Settings for the Remote Control plugin."
 msgstr "遠端控制外掛程式的設定值。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -14608,5 +15490,5 @@
 "照了外部應用程式與此外掛程式的溝通。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:41
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
 msgid "Permitted actions"
 msgstr "准許的動作"
@@ -14720,25 +15602,25 @@
 msgstr "清除路線"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Routing Plugin Preferences"
 msgstr "路線規畫外掛程式偏好設定"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
 msgstr "設定路線規畫偏好設定"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
 msgid "Highway type"
 msgstr "公路類型"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
 msgid "Speed (Km/h)"
 msgstr "速限 (Km/h)"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
 msgid "Weight"
 msgstr "重量限制"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
 msgid "Enter weight values"
 msgstr "輸入重量限制值"
@@ -14784,42 +15666,42 @@
 msgstr "圖片 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:36
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "autozoom"
 msgstr "自動縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
 msgid "autoload tiles"
 msgstr "自動載入拼貼"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "SlippyMap"
 msgstr "快速地圖"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
 msgid "Settings for the SlippyMap plugin."
 msgstr "快速地圖外掛程式的設定值。"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:53
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
 msgid "Tile Sources"
 msgstr "拼貼來源"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:57
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
 msgid "Auto zoom: "
 msgstr "自動縮放： "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
 msgstr "自動載入拼貼： "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
 msgid "Min zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:69
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
 msgid "Max zoom lvl: "
 msgstr "最大縮放等級： "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:73
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
 msgid "Fade background: "
 msgstr "淡化背景： "
@@ -15050,37 +15932,37 @@
 " {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
 msgstr "使用忽略清單。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
 msgstr "使用忽略清單來抑制警告。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
 msgstr "使用錯誤圖層。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
 msgstr "使用錯誤圖層來顯示有問題的元件。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
 msgstr "上傳時顯示資訊層級。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
 msgid "Show the informational tests in the upload check windows."
 msgstr "在上傳檢查視窗中顯示資訊測試。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
 msgid "On demand"
 msgstr "下指令時"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
 msgstr "上傳時"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
 msgid ""
 "An OSM data validator that checks for common errors made by users and editor "
@@ -15088,5 +15970,5 @@
 msgstr "OSM 資料檢驗器，能夠檢查使用者與編輯器程式造成的一般性錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
 msgstr "資料檢驗器"
@@ -15690,5 +16572,5 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4174
+#: build/trans_style.java:4235
 msgid "building"
 msgstr "建築"
@@ -15702,5 +16584,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4181
+#: build/trans_style.java:4242
 msgid "area"
 msgstr "區域"
@@ -16094,55 +16976,55 @@
 msgstr "開啓空白 WMS 圖層以便自檔案載入資料"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "WMS Plugin Preferences"
 msgstr "WMS 外掛程式偏好設定"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
 msgid "Menu Name"
 msgstr "選單名稱"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:47
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:84
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "Menu Name (Default)"
 msgstr "選單名稱（預設值）"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
 msgid "WMS URL (Default)"
 msgstr "WMS URL（預設值）"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Enter a menu name and WMS URL"
 msgstr "輸入選單名稱和 WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Copy Selected Default(s)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
 msgid "Downloader:"
 msgstr "下載器："
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "Overlap tiles"
 msgstr "重疊拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of east:"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:174
 msgid "% of north:"
 msgstr ""
@@ -17694,6 +18576,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:547
-#: build/trans_style.java:555
+#: build/trans_presets.java:361 build/trans_style.java:553
+#: build/trans_style.java:561
 msgid "motorway"
 msgstr "高速公路"
@@ -17719,6 +18601,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:563
-#: build/trans_style.java:571
+#: build/trans_presets.java:361 build/trans_style.java:569
+#: build/trans_style.java:577
 msgid "trunk"
 msgstr "快速道路"
@@ -17744,6 +18626,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:579
-#: build/trans_style.java:587
+#: build/trans_presets.java:361 build/trans_style.java:585
+#: build/trans_style.java:593
 msgid "primary"
 msgstr "省道"
@@ -17769,6 +18651,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:361 build/trans_style.java:595
-#: build/trans_style.java:603
+#: build/trans_presets.java:361 build/trans_style.java:601
+#: build/trans_style.java:609
 msgid "secondary"
 msgstr "縣道"
@@ -17782,5 +18664,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:361 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:617
 msgid "tertiary"
 msgstr "鄉道"
@@ -17798,5 +18680,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3175
+#: build/trans_presets.java:361 build/trans_style.java:3195
 msgid "residential"
 msgstr "居住的"
@@ -17830,6 +18712,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4239
+#: build/trans_presets.java:361 build/trans_style.java:673
+#: build/trans_style.java:4300
 msgid "service"
 msgstr "巷/弄"
@@ -17863,6 +18745,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:848
-#: build/trans_style.java:3240 build/trans_style.java:3241
+#: build/trans_presets.java:361 build/trans_style.java:854
+#: build/trans_style.java:3260 build/trans_style.java:3261
 msgid "construction"
 msgstr "施工"
@@ -17912,5 +18794,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:866
+#: build/trans_presets.java:423 build/trans_style.java:872
 msgid "roundabout"
 msgstr "圓環"
@@ -18896,5 +19778,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3407
+#: build/trans_presets.java:1148 build/trans_style.java:3427
 msgid "marsh"
 msgstr ""
@@ -20293,7 +21175,7 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
-#: build/trans_style.java:635 build/trans_style.java:651
-#: build/trans_style.java:659
+#: build/trans_presets.java:1724 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
 msgid "street"
 msgstr "街"
@@ -21021,28 +21903,28 @@
 #: build/trans_presets.java:1892 build/trans_presets.java:1901
 #: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603 build/trans_style.java:3611
-#: build/trans_style.java:3619 build/trans_style.java:3627
-#: build/trans_style.java:3635 build/trans_style.java:3643
-#: build/trans_style.java:3651 build/trans_style.java:3659
-#: build/trans_style.java:3667 build/trans_style.java:3675
-#: build/trans_style.java:3683 build/trans_style.java:3691
-#: build/trans_style.java:3699 build/trans_style.java:3707
-#: build/trans_style.java:3715 build/trans_style.java:3723
-#: build/trans_style.java:3731 build/trans_style.java:3739
-#: build/trans_style.java:3747 build/trans_style.java:3755
-#: build/trans_style.java:3763 build/trans_style.java:3771
-#: build/trans_style.java:3779 build/trans_style.java:3787
-#: build/trans_style.java:3795 build/trans_style.java:3803
-#: build/trans_style.java:3811 build/trans_style.java:3819
-#: build/trans_style.java:3827 build/trans_style.java:3835
-#: build/trans_style.java:3843 build/trans_style.java:3851
-#: build/trans_style.java:3859 build/trans_style.java:3867
-#: build/trans_style.java:3875 build/trans_style.java:3883
-#: build/trans_style.java:3891 build/trans_style.java:3899
-#: build/trans_style.java:3907 build/trans_style.java:3915
-#: build/trans_style.java:3923 build/trans_style.java:3931
-#: build/trans_style.java:3939 build/trans_style.java:3947
-#: build/trans_style.java:3955
+#: build/trans_style.java:3648 build/trans_style.java:3656
+#: build/trans_style.java:3664 build/trans_style.java:3672
+#: build/trans_style.java:3680 build/trans_style.java:3688
+#: build/trans_style.java:3696 build/trans_style.java:3704
+#: build/trans_style.java:3712 build/trans_style.java:3720
+#: build/trans_style.java:3728 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760 build/trans_style.java:3768
+#: build/trans_style.java:3776 build/trans_style.java:3784
+#: build/trans_style.java:3792 build/trans_style.java:3800
+#: build/trans_style.java:3808 build/trans_style.java:3816
+#: build/trans_style.java:3824 build/trans_style.java:3832
+#: build/trans_style.java:3840 build/trans_style.java:3848
+#: build/trans_style.java:3856 build/trans_style.java:3864
+#: build/trans_style.java:3872 build/trans_style.java:3880
+#: build/trans_style.java:3888 build/trans_style.java:3896
+#: build/trans_style.java:3904 build/trans_style.java:3912
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
+#: build/trans_style.java:4016
 msgid "sport"
 msgstr "運動"
@@ -22737,4 +23619,12 @@
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
 #. color forest
 #. <icon src="misc/landmark/trees.png"/>
@@ -22769,9 +23659,9 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2465 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3111 build/trans_style.java:3159
-#: build/trans_style.java:3167 build/trans_style.java:3265
-#: build/trans_style.java:3273
+#: build/trans_presets.java:2465 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3179 build/trans_style.java:3187
+#: build/trans_style.java:3285 build/trans_style.java:3293
 msgid "green"
 msgstr "綠色"
@@ -24179,7 +25069,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3189 build/trans_style.java:233
-#: build/trans_style.java:683 build/trans_style.java:877
-#: build/trans_style.java:885 build/trans_style.java:893
-#: build/trans_style.java:901 build/trans_style.java:909
+#: build/trans_style.java:689 build/trans_style.java:883
+#: build/trans_style.java:891 build/trans_style.java:899
+#: build/trans_style.java:907 build/trans_style.java:915
 msgid "bicycle"
 msgstr "單車"
@@ -24249,7 +25139,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3189 build/trans_style.java:247
-#: build/trans_style.java:691 build/trans_style.java:699
-#: build/trans_style.java:707 build/trans_style.java:708
-#: build/trans_style.java:716
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:713 build/trans_style.java:714
+#: build/trans_style.java:722
 msgid "foot"
 msgstr ""
@@ -24275,5 +25165,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3189 build/trans_style.java:1161
+#: build/trans_presets.java:3189 build/trans_style.java:1167
 msgid "subway"
 msgstr ""
@@ -24569,5 +25459,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:3969
+#: build/trans_style.java:633 build/trans_style.java:4030
 msgid "deprecated"
 msgstr ""
@@ -24609,5 +25499,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:675
+#: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
 msgstr ""
@@ -24717,4 +25607,10 @@
 #. </rule>
 #.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -24752,5 +25648,5 @@
 #. <rule>
 #. <condition k="barrier" v="fence"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
 #. color barrier
@@ -24823,11 +25719,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:382 build/trans_style.java:395
-#: build/trans_style.java:396 build/trans_style.java:415
-#: build/trans_style.java:416 build/trans_style.java:435
-#: build/trans_style.java:436 build/trans_style.java:443
-#: build/trans_style.java:456 build/trans_style.java:457
-#: build/trans_style.java:470 build/trans_style.java:471
-#: build/trans_style.java:484 build/trans_style.java:485
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
 msgstr ""
@@ -24890,5 +25786,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:542
+#: build/trans_style.java:548
 msgid "motorroad"
 msgstr ""
@@ -24944,7 +25840,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:919
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:943 build/trans_style.java:951
+#: build/trans_style.java:649 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_style.java:949 build/trans_style.java:957
 msgid "highway_track"
 msgstr ""
@@ -25015,9 +25911,9 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:724 build/trans_style.java:1135
-#: build/trans_style.java:1199 build/trans_style.java:1207
-#: build/trans_style.java:1216 build/trans_style.java:1224
-#: build/trans_style.java:1232 build/trans_style.java:1233
-#: build/trans_style.java:1240
+#: build/trans_style.java:730 build/trans_style.java:1141
+#: build/trans_style.java:1205 build/trans_style.java:1213
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1238 build/trans_style.java:1239
+#: build/trans_style.java:1246
 msgid "rail"
 msgstr ""
@@ -25109,5 +26005,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:810
+#: build/trans_style.java:816
 msgid "services"
 msgstr ""
@@ -25121,5 +26017,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:818
+#: build/trans_style.java:824
 msgid "ford"
 msgstr ""
@@ -25140,10 +26036,10 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:833
+#: build/trans_style.java:839
 msgid "turningcircle"
 msgstr ""
 
 #. color construction
-#. <icon src="misc/construction.png"/>
+#. <icon src="misc/construction.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25153,5 +26049,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:857
+#: build/trans_style.java:863
 msgid "emergency_access_point"
 msgstr ""
@@ -25166,5 +26062,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:969 build/trans_style.java:970
+#: build/trans_style.java:975 build/trans_style.java:976
 msgid "riverbank"
 msgstr ""
@@ -25178,5 +26074,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:986
+#: build/trans_style.java:992
 msgid "stream"
 msgstr ""
@@ -25190,5 +26086,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1002
+#: build/trans_style.java:1008
 msgid "dock"
 msgstr ""
@@ -25377,13 +26273,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1025 build/trans_style.java:1054
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1071 build/trans_style.java:1548
-#: build/trans_style.java:1555 build/trans_style.java:1564
-#: build/trans_style.java:1572 build/trans_style.java:1604
-#: build/trans_style.java:1612 build/trans_style.java:1620
-#: build/trans_style.java:1628 build/trans_style.java:1635
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1031 build/trans_style.java:1060
+#: build/trans_style.java:1068 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1554
+#: build/trans_style.java:1561 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1610
+#: build/trans_style.java:1618 build/trans_style.java:1626
+#: build/trans_style.java:1634 build/trans_style.java:1641
+#: build/trans_style.java:1650 build/trans_style.java:1658
+#: build/trans_style.java:1666 build/trans_style.java:1674
 msgid "manmade"
 msgstr ""
@@ -25445,7 +26341,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1081 build/trans_style.java:1096
-#: build/trans_style.java:1111 build/trans_style.java:1119
-#: build/trans_style.java:1127
+#: build/trans_style.java:1087 build/trans_style.java:1102
+#: build/trans_style.java:1117 build/trans_style.java:1125
+#: build/trans_style.java:1133
 msgid "railwaypoint"
 msgstr ""
@@ -25468,10 +26364,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1144 build/trans_style.java:1153
+#: build/trans_style.java:1150 build/trans_style.java:1159
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1145
+#: build/trans_style.java:1151
 msgid "railover"
 msgstr ""
@@ -25507,7 +26403,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1169 build/trans_style.java:1179
-#: build/trans_style.java:1180 build/trans_style.java:1190
-#: build/trans_style.java:1191
+#: build/trans_style.java:1175 build/trans_style.java:1185
+#: build/trans_style.java:1186 build/trans_style.java:1196
+#: build/trans_style.java:1197
 msgid "oldrail"
 msgstr ""
@@ -25553,6 +26449,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1271 build/trans_style.java:1272
-#: build/trans_style.java:1304
+#: build/trans_style.java:1277 build/trans_style.java:1278
+#: build/trans_style.java:1310
 msgid "aeroway"
 msgstr ""
@@ -25566,5 +26462,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1280
+#: build/trans_style.java:1286
 msgid "terminal"
 msgstr ""
@@ -25586,5 +26482,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1288 build/trans_style.java:1296
+#: build/trans_style.java:1294 build/trans_style.java:1302
 msgid "aeroway_dark"
 msgstr ""
@@ -25598,5 +26494,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1312
+#: build/trans_style.java:1318
 msgid "aeroway_light"
 msgstr ""
@@ -25658,7 +26554,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1336 build/trans_style.java:1344
-#: build/trans_style.java:1352 build/trans_style.java:1360
-#: build/trans_style.java:1368
+#: build/trans_style.java:1342 build/trans_style.java:1350
+#: build/trans_style.java:1358 build/trans_style.java:1366
+#: build/trans_style.java:1374
 msgid "aerialway"
 msgstr ""
@@ -25675,5 +26571,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1378 build/trans_style.java:1379
+#: build/trans_style.java:1384 build/trans_style.java:1385
 msgid "piste_easy"
 msgstr ""
@@ -25688,5 +26584,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1393 build/trans_style.java:1394
 msgid "piste_intermediate"
 msgstr ""
@@ -25701,5 +26597,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1396 build/trans_style.java:1397
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "piste_advanced"
 msgstr ""
@@ -25714,5 +26610,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1405 build/trans_style.java:1406
+#: build/trans_style.java:1411 build/trans_style.java:1412
 msgid "piste_expert"
 msgstr ""
@@ -25727,5 +26623,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1414 build/trans_style.java:1415
+#: build/trans_style.java:1420 build/trans_style.java:1421
 msgid "piste_freeride"
 msgstr ""
@@ -25740,5 +26636,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1423 build/trans_style.java:1424
+#: build/trans_style.java:1429 build/trans_style.java:1430
 msgid "piste_novice"
 msgstr ""
@@ -25858,11 +26754,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1435 build/trans_style.java:1449
-#: build/trans_style.java:1457 build/trans_style.java:1466
-#: build/trans_style.java:1474 build/trans_style.java:1482
-#: build/trans_style.java:1490 build/trans_style.java:1498
-#: build/trans_style.java:1506 build/trans_style.java:1514
-#: build/trans_style.java:1522 build/trans_style.java:1530
-#: build/trans_style.java:1538
+#: build/trans_style.java:1441 build/trans_style.java:1455
+#: build/trans_style.java:1463 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
+#: build/trans_style.java:1496 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1520
+#: build/trans_style.java:1528 build/trans_style.java:1536
+#: build/trans_style.java:1544
 msgid "power"
 msgstr ""
@@ -25876,5 +26772,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1579 build/trans_style.java:1580
+#: build/trans_style.java:1585 build/trans_style.java:1586
 msgid "pier"
 msgstr ""
@@ -25888,5 +26784,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1588
+#: build/trans_style.java:1594
 msgid "pipeline"
 msgstr ""
@@ -26030,13 +26926,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1678 build/trans_style.java:1686
-#: build/trans_style.java:1694 build/trans_style.java:1702
-#: build/trans_style.java:1710 build/trans_style.java:1718
-#: build/trans_style.java:1734 build/trans_style.java:1742
-#: build/trans_style.java:1750 build/trans_style.java:1758
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1814
+#: build/trans_style.java:1684 build/trans_style.java:1692
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1772 build/trans_style.java:1780
+#: build/trans_style.java:1788 build/trans_style.java:1796
+#: build/trans_style.java:1804 build/trans_style.java:1812
+#: build/trans_style.java:1820
 msgid "leisure"
 msgstr ""
@@ -26050,5 +26946,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1726
+#: build/trans_style.java:1732
 msgid "marina"
 msgstr ""
@@ -26144,10 +27040,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1824 build/trans_style.java:1832
-#: build/trans_style.java:1840 build/trans_style.java:1848
-#: build/trans_style.java:1856 build/trans_style.java:1864
-#: build/trans_style.java:1872 build/trans_style.java:1880
-#: build/trans_style.java:1888 build/trans_style.java:1896
-#: build/trans_style.java:1904
+#: build/trans_style.java:1830 build/trans_style.java:1838
+#: build/trans_style.java:1846 build/trans_style.java:1854
+#: build/trans_style.java:1862 build/trans_style.java:1870
+#: build/trans_style.java:1878 build/trans_style.java:1886
+#: build/trans_style.java:1894 build/trans_style.java:1902
+#: build/trans_style.java:1910
 msgid "amenity"
 msgstr ""
@@ -26249,14 +27145,21 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1983
-#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1934 build/trans_style.java:1942
+#: build/trans_style.java:1950 build/trans_style.java:1958
+#: build/trans_style.java:1966 build/trans_style.java:1974
+#: build/trans_style.java:1982 build/trans_style.java:1989
+#: build/trans_style.java:1998 build/trans_style.java:2006
 msgid "amenity_traffic"
 msgstr ""
 
 #. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26652,5 +27555,5 @@
 #. <condition k="amenity" v="marketplace"/>
 #. color amenity_light
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="place/marketplace.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26675,23 +27578,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2008 build/trans_style.java:2023
-#: build/trans_style.java:2031 build/trans_style.java:2039
-#: build/trans_style.java:2054 build/trans_style.java:2062
-#: build/trans_style.java:2070 build/trans_style.java:2078
-#: build/trans_style.java:2193 build/trans_style.java:2201
-#: build/trans_style.java:2208 build/trans_style.java:2217
-#: build/trans_style.java:2225 build/trans_style.java:2233
-#: build/trans_style.java:2241 build/trans_style.java:2249
-#: build/trans_style.java:2257 build/trans_style.java:2265
-#: build/trans_style.java:2328 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2353
-#: build/trans_style.java:2361 build/trans_style.java:2368
-#: build/trans_style.java:2376 build/trans_style.java:2384
-#: build/trans_style.java:2392 build/trans_style.java:2400
-#: build/trans_style.java:2408 build/trans_style.java:2416
-#: build/trans_style.java:2424 build/trans_style.java:2432
-#: build/trans_style.java:2440 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2464
-#: build/trans_style.java:2473 build/trans_style.java:2488
+#: build/trans_style.java:2021 build/trans_style.java:2036
+#: build/trans_style.java:2044 build/trans_style.java:2052
+#: build/trans_style.java:2067 build/trans_style.java:2075
+#: build/trans_style.java:2083 build/trans_style.java:2091
+#: build/trans_style.java:2206 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2230
+#: build/trans_style.java:2238 build/trans_style.java:2246
+#: build/trans_style.java:2254 build/trans_style.java:2262
+#: build/trans_style.java:2270 build/trans_style.java:2278
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2366
+#: build/trans_style.java:2374 build/trans_style.java:2381
+#: build/trans_style.java:2389 build/trans_style.java:2397
+#: build/trans_style.java:2405 build/trans_style.java:2413
+#: build/trans_style.java:2421 build/trans_style.java:2429
+#: build/trans_style.java:2437 build/trans_style.java:2445
+#: build/trans_style.java:2453 build/trans_style.java:2461
+#: build/trans_style.java:2469 build/trans_style.java:2477
+#: build/trans_style.java:2486 build/trans_style.java:2501
 msgid "amenity_light"
 msgstr ""
@@ -26723,6 +27626,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2086 build/trans_style.java:2094
-#: build/trans_style.java:3326
+#: build/trans_style.java:2099 build/trans_style.java:2107
+#: build/trans_style.java:3346
 msgid "light_water"
 msgstr ""
@@ -26783,8 +27686,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2297
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320
+#: build/trans_style.java:2285 build/trans_style.java:2293
+#: build/trans_style.java:2301 build/trans_style.java:2310
+#: build/trans_style.java:2317 build/trans_style.java:2325
+#: build/trans_style.java:2333
 msgid "health"
 msgstr ""
@@ -27137,26 +28040,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2498 build/trans_style.java:2506
-#: build/trans_style.java:2514 build/trans_style.java:2522
-#: build/trans_style.java:2530 build/trans_style.java:2538
-#: build/trans_style.java:2546 build/trans_style.java:2554
-#: build/trans_style.java:2562 build/trans_style.java:2570
-#: build/trans_style.java:2578 build/trans_style.java:2586
-#: build/trans_style.java:2594 build/trans_style.java:2602
-#: build/trans_style.java:2610 build/trans_style.java:2618
-#: build/trans_style.java:2626 build/trans_style.java:2634
-#: build/trans_style.java:2642 build/trans_style.java:2650
-#: build/trans_style.java:2658 build/trans_style.java:2666
-#: build/trans_style.java:2674 build/trans_style.java:2682
-#: build/trans_style.java:2690 build/trans_style.java:2698
-#: build/trans_style.java:2706 build/trans_style.java:2714
-#: build/trans_style.java:2722 build/trans_style.java:2730
-#: build/trans_style.java:2738 build/trans_style.java:2746
-#: build/trans_style.java:2754 build/trans_style.java:2762
-#: build/trans_style.java:2770 build/trans_style.java:2778
-#: build/trans_style.java:2786 build/trans_style.java:2794
-#: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2818 build/trans_style.java:2826
-#: build/trans_style.java:2835
+#: build/trans_style.java:2511 build/trans_style.java:2519
+#: build/trans_style.java:2527 build/trans_style.java:2535
+#: build/trans_style.java:2543 build/trans_style.java:2551
+#: build/trans_style.java:2559 build/trans_style.java:2567
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2599
+#: build/trans_style.java:2607 build/trans_style.java:2615
+#: build/trans_style.java:2623 build/trans_style.java:2631
+#: build/trans_style.java:2639 build/trans_style.java:2647
+#: build/trans_style.java:2655 build/trans_style.java:2663
+#: build/trans_style.java:2671 build/trans_style.java:2679
+#: build/trans_style.java:2687 build/trans_style.java:2695
+#: build/trans_style.java:2703 build/trans_style.java:2711
+#: build/trans_style.java:2719 build/trans_style.java:2727
+#: build/trans_style.java:2735 build/trans_style.java:2743
+#: build/trans_style.java:2751 build/trans_style.java:2759
+#: build/trans_style.java:2767 build/trans_style.java:2775
+#: build/trans_style.java:2783 build/trans_style.java:2791
+#: build/trans_style.java:2799 build/trans_style.java:2807
+#: build/trans_style.java:2815 build/trans_style.java:2823
+#: build/trans_style.java:2831 build/trans_style.java:2839
+#: build/trans_style.java:2848
 msgid "shop"
 msgstr ""
@@ -27228,8 +28131,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2845 build/trans_style.java:2853
-#: build/trans_style.java:2861 build/trans_style.java:2869
-#: build/trans_style.java:2877 build/trans_style.java:2885
-#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2858 build/trans_style.java:2866
+#: build/trans_style.java:2874 build/trans_style.java:2882
+#: build/trans_style.java:2890 build/trans_style.java:2898
+#: build/trans_style.java:2906 build/trans_style.java:2914
 msgid "hotel"
 msgstr ""
@@ -27300,5 +28203,5 @@
 #. <rule>
 #. <condition k="information" v="guidepost"/>
-#. <icon annotate="true" src="misc/information/guidepost.png"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27307,5 +28210,5 @@
 #. <rule>
 #. <condition k="information" v="office"/>
-#. <icon annotate="true" src="misc/information/informationoffice.png"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
 #. color tourism
 #. <scale_min>1</scale_min>
@@ -27315,5 +28218,5 @@
 #. <rule>
 #. <condition k="information" v="map"/>
-#. <icon annotate="true" src="misc/information/map.png"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27322,5 +28225,5 @@
 #. <rule>
 #. <condition k="information" v="board"/>
-#. <icon annotate="true" src="misc/information/board.png"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -27330,9 +28233,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2909 build/trans_style.java:2917
-#: build/trans_style.java:2925 build/trans_style.java:2933
-#: build/trans_style.java:2941 build/trans_style.java:2949
-#: build/trans_style.java:2950 build/trans_style.java:2958
-#: build/trans_style.java:2974 build/trans_style.java:2996
+#: build/trans_style.java:2922 build/trans_style.java:2930
+#: build/trans_style.java:2938 build/trans_style.java:2946
+#: build/trans_style.java:2954 build/trans_style.java:2962
+#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2987 build/trans_style.java:3009
 msgid "tourism"
 msgstr ""
@@ -27420,14 +28323,13 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3006 build/trans_style.java:3014
-#: build/trans_style.java:3022 build/trans_style.java:3030
-#: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054 build/trans_style.java:3062
-#: build/trans_style.java:3070 build/trans_style.java:3078
+#: build/trans_style.java:3019 build/trans_style.java:3027
+#: build/trans_style.java:3035 build/trans_style.java:3043
+#: build/trans_style.java:3051 build/trans_style.java:3059
+#: build/trans_style.java:3067 build/trans_style.java:3075
+#: build/trans_style.java:3083 build/trans_style.java:3091
 msgid "historic"
 msgstr ""
 
 #. color green
-#. <icon annotate="true" src="shop/groceries/fruits.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27436,5 +28338,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3139
 msgid "quarry"
 msgstr ""
@@ -27448,5 +28350,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3147
 msgid "landfill"
 msgstr ""
@@ -27468,5 +28370,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3135 build/trans_style.java:3143
+#: build/trans_style.java:3155 build/trans_style.java:3163
 msgid "basin"
 msgstr ""
@@ -27480,5 +28382,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3171
 msgid "forest"
 msgstr ""
@@ -27492,5 +28394,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3183
+#: build/trans_style.java:3203
 msgid "farmyard"
 msgstr ""
@@ -27513,5 +28415,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3192 build/trans_style.java:3200
+#: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "retail"
 msgstr ""
@@ -27525,5 +28427,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3228
 msgid "industrial"
 msgstr ""
@@ -27537,5 +28439,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3236
 msgid "brownfield"
 msgstr ""
@@ -27549,5 +28451,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3224
+#: build/trans_style.java:3244
 msgid "greenfield"
 msgstr ""
@@ -27561,5 +28463,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3232
+#: build/trans_style.java:3252
 msgid "railland"
 msgstr ""
@@ -27616,7 +28518,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3249 build/trans_style.java:3284
-#: build/trans_style.java:3292 build/trans_style.java:3300
-#: build/trans_style.java:3308 build/trans_style.java:3316
+#: build/trans_style.java:3269 build/trans_style.java:3304
+#: build/trans_style.java:3312 build/trans_style.java:3320
+#: build/trans_style.java:3328 build/trans_style.java:3336
 msgid "military"
 msgstr ""
@@ -27630,5 +28532,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3257
+#: build/trans_style.java:3277
 msgid "cemetery"
 msgstr ""
@@ -27641,5 +28543,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3333
+#: build/trans_style.java:3353
 msgid "peak"
 msgstr ""
@@ -27654,5 +28556,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3362
 msgid "glacier"
 msgstr ""
@@ -27666,5 +28568,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3370
 msgid "volcano"
 msgstr ""
@@ -27719,8 +28621,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3358 build/trans_style.java:3359
-#: build/trans_style.java:3367 build/trans_style.java:3383
-#: build/trans_style.java:3447 build/trans_style.java:3455
-#: build/trans_style.java:3463
+#: build/trans_style.java:3378 build/trans_style.java:3379
+#: build/trans_style.java:3387 build/trans_style.java:3403
+#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3483
 msgid "natural"
 msgstr ""
@@ -27734,5 +28636,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3395
 msgid "scrub"
 msgstr ""
@@ -27746,5 +28648,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3391
+#: build/trans_style.java:3411
 msgid "heath"
 msgstr ""
@@ -27758,5 +28660,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3399
+#: build/trans_style.java:3419
 msgid "woodarea"
 msgstr ""
@@ -27770,5 +28672,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3431
+#: build/trans_style.java:3451
 msgid "mud"
 msgstr ""
@@ -27782,5 +28684,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3439
+#: build/trans_style.java:3459
 msgid "beach"
 msgstr ""
@@ -27858,8 +28760,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3479 build/trans_style.java:3487
-#: build/trans_style.java:3495 build/trans_style.java:3503
-#: build/trans_style.java:3511 build/trans_style.java:3519
-#: build/trans_style.java:3527 build/trans_style.java:3535
+#: build/trans_style.java:3499 build/trans_style.java:3507
+#: build/trans_style.java:3515 build/trans_style.java:3523
+#: build/trans_style.java:3531 build/trans_style.java:3539
+#: build/trans_style.java:3547 build/trans_style.java:3555
 msgid "route"
 msgstr ""
@@ -27882,4 +28784,45 @@
 #.
 #. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
 #. <condition k="boundary" v="administrative"/>
 #. color boundary
@@ -27907,7 +28850,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3545 build/trans_style.java:3553
-#: build/trans_style.java:3561 build/trans_style.java:3569
-#: build/trans_style.java:3577
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3577 build/trans_style.java:3581
+#: build/trans_style.java:3585 build/trans_style.java:3589
+#: build/trans_style.java:3593 build/trans_style.java:3597
+#: build/trans_style.java:3601 build/trans_style.java:3605
+#: build/trans_style.java:3609 build/trans_style.java:3614
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3638
 msgid "boundary"
 msgstr ""
@@ -28057,11 +29005,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4017 build/trans_style.java:4025
-#: build/trans_style.java:4033 build/trans_style.java:4041
-#: build/trans_style.java:4049 build/trans_style.java:4057
-#: build/trans_style.java:4065 build/trans_style.java:4073
-#: build/trans_style.java:4081 build/trans_style.java:4089
-#: build/trans_style.java:4097 build/trans_style.java:4105
-#: build/trans_style.java:4113
+#: build/trans_style.java:4078 build/trans_style.java:4086
+#: build/trans_style.java:4094 build/trans_style.java:4102
+#: build/trans_style.java:4110 build/trans_style.java:4118
+#: build/trans_style.java:4126 build/trans_style.java:4134
+#: build/trans_style.java:4142 build/trans_style.java:4150
+#: build/trans_style.java:4158 build/trans_style.java:4166
+#: build/trans_style.java:4174
 msgid "place"
 msgstr ""
@@ -28109,6 +29057,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4202 build/trans_style.java:4209
-#: build/trans_style.java:4216 build/trans_style.java:4223
+#: build/trans_style.java:4263 build/trans_style.java:4270
+#: build/trans_style.java:4277 build/trans_style.java:4284
 msgid "address"
 msgstr ""
@@ -28464,4 +29412,14 @@
 msgstr ""
 
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "OSM 伺服器 (REST API) 的基礎 URL"
+
+#~ msgid "Login name (e-mail) to the OSM account."
+#~ msgstr "OSM 帳號的登入名稱 (e-mail)。"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
+
 #~ msgid "Combine Anyway"
 #~ msgstr "合併，不管怎樣"
@@ -28552,7 +29510,4 @@
 #~ msgid "Update Selection"
 #~ msgstr "更新選擇區域"
-
-#~ msgid "Update failed"
-#~ msgstr "更新失敗"
 
 #~ msgid "Upload to OSM..."
@@ -28954,7 +29909,4 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。"
-
-#~ msgid "Validate"
-#~ msgstr "檢驗"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -29116,12 +30068,6 @@
 #~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
 
-#~ msgid "API initialization failed"
-#~ msgstr "API 初始化失敗"
-
 #~ msgid "History item"
 #~ msgstr "歷史記錄項目"
-
-#~ msgid "Request Update"
-#~ msgstr "要求更新"
 
 #~ msgid "help"
@@ -29212,4 +30158,7 @@
 #~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
 #~ msgstr "無法取消指令「{0}」，因為圖層「{1}」已不存在"
+
+#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
+#~ msgstr "無法讀取載入資源「{0}」。錯誤為 {1}"
 
 #~ msgid "User with the same uid but different name found"
@@ -29234,2 +30183,32 @@
 #~ "標節點的這些成員屬性或是要 <strong>移除</strong> 它們。<br>預設值是 "
 #~ "<strong>保留</strong> 它們：目標節點將會取代原本成員中節點的位置。</html>"
+
+#~ msgid "Warning: no preference ''{0}'' found. Will use no proxy."
+#~ msgstr "警告：找不到偏好設定「{0}」。將不使用代理伺服器。"
+
+#~ msgid ""
+#~ "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
+#~ "''{1}''. Proxy won't be used"
+#~ msgstr ""
+#~ "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使"
+#~ "用代理伺服器"
+
+#~ msgid ""
+#~ "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
+#~ "''{1}''. Proxy won't be used"
+#~ msgstr ""
+#~ "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不"
+#~ "使用代理伺服器"
+
+#~ msgid ""
+#~ "Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
+#~ msgstr ""
+#~ "在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺"
+#~ "服器。"
+
+#~ msgid ""
+#~ "Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
+#~ "Proxy won't be used."
+#~ msgstr ""
+#~ "在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代"
+#~ "理伺服器。"
