Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java	(revision 31511)
@@ -36,5 +36,5 @@
     text.setAlignmentX(Component.CENTER_ALIGNMENT);
     this.add(text);
-    JButton web = new JButton("Approve upload on the website.");
+    JButton web = new JButton(tr("Approve upload on the website"));
     web.addActionListener(new WebAction());
     web.setAlignmentX(Component.CENTER_ALIGNMENT);
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java	(revision 31511)
@@ -100,5 +100,5 @@
     this.choose.addActionListener(this);
 
-    // All options belong to the same jpanel so the are in line.
+    // All options belong to the same JPanel so the are in line.
     JPanel jpanel = new JPanel();
     jpanel.setLayout(new BoxLayout(jpanel, BoxLayout.PAGE_AXIS));
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java	(revision 31511)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.mapillary.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.BoxLayout;
@@ -34,5 +36,5 @@
     this.group = new ButtonGroup();
 
-    this.sequence = new JRadioButton("Upload selected sequence.");
+    this.sequence = new JRadioButton(tr("Upload selected sequence"));
     if (MapillaryLayer.getInstance().getData().getSelectedImage() == null
         || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImportedImage))
@@ -42,5 +44,5 @@
     this.group.setSelected(this.sequence.getModel(), true);
 
-    this.delete = new JCheckBox("Delete after uplaod");
+    this.delete = new JCheckBox(tr("Delete after upload"));
     this.delete.setSelected(Main.pref.getBoolean(
         "mapillary.delete-after-upload", true));
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryWalkDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryWalkDialog.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryWalkDialog.java	(revision 31511)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.mapillary.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.JCheckBox;
@@ -37,13 +39,13 @@
     add(interval);
 
-    this.waitForPicture = new JCheckBox("Wait for full quality pictures");
+    this.waitForPicture = new JCheckBox(tr("Wait for full quality pictures"));
     this.waitForPicture.setSelected(true);
     add(this.waitForPicture);
 
-    this.followSelection = new JCheckBox("Follow selected image");
+    this.followSelection = new JCheckBox(tr("Follow selected image"));
     this.followSelection.setSelected(true);
     add(this.followSelection);
 
-    this.goForward = new JCheckBox("Go forward");
+    this.goForward = new JCheckBox(tr("Go forward"));
     this.goForward.setSelected(true);
     add(this.goForward);
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java	(revision 31511)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.mapillary.mode;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -88,5 +90,5 @@
   @Override
   public String toString() {
-    return "Join mode";
+    return tr("Join mode");
   }
 }
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 31511)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.mapillary.mode;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Graphics2D;
@@ -200,5 +202,5 @@
   @Override
   public String toString() {
-    return "Select mode";
+    return tr("Select mode");
   }
 }
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java	(revision 31511)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.mapillary.oauth;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -20,5 +22,5 @@
 public class OAuthPortListener extends Thread {
 
-  protected static String RESPONSE = "<html><head><title>Mapillary login</title></head><body>Login successful, return to JOSM.</body></html>";
+  protected static String RESPONSE = tr("<html><head><title>Mapillary login</title></head><body>Login successful, return to JOSM.</body></html>");
 
   @Override
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java	(revision 31510)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java	(revision 31511)
@@ -40,8 +40,8 @@
     String ret = "";
     if (PluginState.isDownloading())
-      ret += tr("Downloading");
+      ret += tr("Downloading Mapillary images");
     else if (MapillaryLayer.getInstance().getData().size() > 0)
-      ret += tr("Total images: {0}", MapillaryLayer.getInstance().getData()
-          .size());
+      ret += tr("Total Mapillary images: {0}", MapillaryLayer.getInstance()
+          .getData().size());
     else
       ret += tr("No images found");
@@ -141,5 +141,6 @@
    * @param mapillaryAbstractImage2
    */
-  public synchronized static void join(MapillaryAbstractImage mapillaryAbstractImage,
+  public synchronized static void join(
+      MapillaryAbstractImage mapillaryAbstractImage,
       MapillaryAbstractImage mapillaryAbstractImage2) {
     MapillaryAbstractImage firstImage = mapillaryAbstractImage;
@@ -175,5 +176,6 @@
    * @param mapillaryAbstractImage2
    */
-  public synchronized static void unjoin(MapillaryAbstractImage mapillaryAbstractImage,
+  public synchronized static void unjoin(
+      MapillaryAbstractImage mapillaryAbstractImage,
       MapillaryAbstractImage mapillaryAbstractImage2) {
     MapillaryAbstractImage firstImage = mapillaryAbstractImage;
@@ -271,4 +273,5 @@
   /**
    * Returns the current date.
+   *
    * @return A {@code String} object containing the current date.
    */