Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 1676)
@@ -90,5 +90,5 @@
JTextField authorName = new JTextField(Main.pref.get("lastAuthorName"));
p.add(authorName, GBC.eol().fill(GBC.HORIZONTAL));
- JLabel emailLabel = new JLabel(tr("Email"));
+ JLabel emailLabel = new JLabel(tr("E-Mail"));
p.add(emailLabel, GBC.std().insets(10,0,5,0));
JTextField email = new JTextField(Main.pref.get("osm-server.username"));
Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 1676)
@@ -205,10 +205,10 @@
if(url.equals(langurl))
{
- txt = (""+tr("Helppage missing. Create it in english.",
+ txt = (""+tr("Help page missing. Create it in english.",
url+"?action=edit")+"");
}
else
{
- txt = (""+tr("Helppage missing. Create it in english or your language.",
+ txt = (""+tr("Help page missing. Create it in english or your language.",
url+"?action=edit", langurl+"?action=edit")+"");
}
Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 1676)
@@ -248,5 +248,5 @@
* Check the data set if it would be empty on save. It is empty, if it contains
* no objects (after all objects that are created and deleted without being
- * transfered to the server have been removed).
+ * transferred to the server have been removed).
*
* @return true, if a save result in an empty data set.
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 1676)
@@ -93,5 +93,5 @@
if(! errors.equals("")) {
JOptionPane.showMessageDialog(Main.parent,
- tr("The following errors occured during mass download:") + "\r\n" + errors,
+ tr("The following errors occurred during mass download:") + "\r\n" + errors,
tr("Errors during Download"),
JOptionPane.ERROR_MESSAGE);
Index: trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 1676)
@@ -50,5 +50,5 @@
return new DefaultMutableTreeNode(
new JLabel(
- tr("Resolve conflicts in member list of of relation {0}", my.id),
+ tr("Resolve conflicts in member list of relation {0}", my.id),
ImageProvider.get("data", "object"),
JLabel.HORIZONTAL
Index: trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (revision 1676)
@@ -80,5 +80,5 @@
gc.gridy = 0;
lblMergedVersion = new JLabel(tr("Merged version"));
- lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
+ lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
add(lblMergedVersion, gc);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 1675)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 1676)
@@ -34,10 +34,10 @@
osmDataServer.setToolTipText(tr("The base URL for the OSM server (REST API)"));
- osmDataUsername.setToolTipText(tr("Login name (email) to the OSM account."));
+ osmDataUsername.setToolTipText(tr("Login name (e-mail) to the OSM account."));
osmDataPassword.setToolTipText(tr("Login password to the OSM account. Leave blank to not store any password."));
gui.connection.add(new JLabel(tr("Base Server URL")), GBC.std());
gui.connection.add(osmDataServer, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
- gui.connection.add(new JLabel(tr("OSM username (email)")), GBC.std());
+ gui.connection.add(new JLabel(tr("OSM username (e-mail)")), GBC.std());
gui.connection.add(osmDataUsername, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
gui.connection.add(new JLabel(tr("OSM password")), GBC.std());
@@ -45,5 +45,5 @@
JLabel warning = new JLabel(tr("" +
"WARNING: The password is stored in plain text in the preferences file.
" +
- "The password is transfered in plain text to the server, encoded in the URL.
" +
+ "The password is transferred in plain text to the server, encoded in the URL.
" +
"Do not use a valuable Password."));
warning.setFont(warning.getFont().deriveFont(Font.ITALIC));