Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 2877) @@ -99,5 +99,5 @@ gc.gridx = 0; gc.weightx = 0.0; - add(new JLabel(tr("Authorise URL:")), gc); + add(new JLabel(tr("Authorize URL:")), gc); gc.gridx = 1; Index: trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 2877) @@ -73,5 +73,5 @@ "Run a fully automatic procedure to get an access token from the OSM website.
" + "JOSM accesses the OSM website on behalf of the JOSM user and fully
" - + "automatically authorises the user and retrieves an Access Token." + + "automatically authorizes the user and retrieves an Access Token." )); break; Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 2877) @@ -331,7 +331,7 @@ class RunAuthorisationAction extends AbstractAction implements DocumentListener{ public RunAuthorisationAction() { - putValue(NAME, tr("Authorise now")); + putValue(NAME, tr("Authorize now")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth")); - putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorisation form on the JOSM web site")); + putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorization form on the JOSM web site")); updateEnabledState(); } @@ -364,5 +364,5 @@ public BackAction() { putValue(NAME, tr("Back")); - putValue(SHORT_DESCRIPTION, tr("Run the automatic authorisation steps again")); + putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous")); } @@ -440,5 +440,5 @@ public FullyAutomaticAuthorisationTask(Component parent) { - super(parent, tr("Authorise JOSM to access the OSM API"), false /* don't ignore exceptions */); + super(parent, tr("Authorize JOSM to access the OSM API"), false /* don't ignore exceptions */); } @@ -457,9 +457,9 @@ + "The automatic process for retrieving an OAuth Access Token
" + "from the OSM server failed.

" - + "Please try again or choose another kind of authorisation process,
" - + "i.e. semi-automatic or manual authorisation." + + "Please try again or choose another kind of authorization process,
" + + "i.e. semi-automatic or manual authorization." +"" ), - tr("OAuth authorisation failed"), + tr("OAuth authorization failed"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed") @@ -473,10 +473,10 @@ + "The automatic process for retrieving an OAuth Access Token
" + "from the OSM server failed because JOSM was not able to build
" - + "a valid login URL from the OAuth Authorise Endpoint URL ''{0}''.

" + + "a valid login URL from the OAuth Authorize Endpoint URL ''{0}''.

" + "Please check your advanced setting and try again." + "", getAdvancedPropertiesPanel().getAdvancedParameters().getAuthoriseUrl() ), - tr("OAuth authorisation failed"), + tr("OAuth authorization failed"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed") @@ -503,5 +503,5 @@ getOsmUserName() ), - tr("OAuth authorisation failed"), + tr("OAuth authorization failed"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed") Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 2877) @@ -56,5 +56,5 @@ pnlMessage= new HtmlPanel(); pnlMessage.setText("" - + tr("Please enter an OAuth Access Token which is authorised to access the OSM server " + + tr("Please enter an OAuth Access Token which is authorized to access the OSM server " + "''{0}''.", getApiUrl()) + ""); @@ -138,5 +138,5 @@ super.setApiUrl(apiUrl); pnlMessage.setText(tr("" - + "Please enter an OAuth Access Token which is authorised to access the OSM server " + + "Please enter an OAuth Access Token which is authorized to access the OSM server " + "''{0}''." + "", Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 2877) @@ -119,5 +119,5 @@ gc.gridwidth = 1; gc.weightx = 0.0; - lbl = new JLabel(tr("Please select an authorisation procedure: ")); + lbl = new JLabel(tr("Please select an authorization procedure: ")); lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN)); pnl.add(lbl,gc); @@ -338,5 +338,5 @@ putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); - putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorisation")); + putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorization")); } Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 2877) @@ -435,5 +435,5 @@ int retCode = connection.getResponseCode(); if (retCode != HttpURLConnection.HTTP_MOVED_TEMP) - throw new OsmOAuthAuthorizationException(tr("Failed to authorise OAuth request ''{0}''", requestToken.getKey())); + throw new OsmOAuthAuthorizationException(tr("Failed to authorize OAuth request ''{0}''", requestToken.getKey())); } catch(MalformedURLException e) { throw new OsmOAuthAuthorizationException(e); @@ -482,5 +482,5 @@ } try { - monitor.beginTask(tr("Authorising OAuth Request token ''{0}'' at the OSM website ...", requestToken.getKey())); + monitor.beginTask(tr("Authorizing OAuth Request token ''{0}'' at the OSM website ...", requestToken.getKey())); monitor.setTicksCount(4); monitor.indeterminateSubTask(tr("Initializing a session at the OSM website...")); @@ -496,5 +496,5 @@ monitor.worked(1); - monitor.indeterminateSubTask(tr("Authorising request token ''{0}''...", requestToken.getKey())); + monitor.indeterminateSubTask(tr("Authorizing request token ''{0}''...", requestToken.getKey())); sendAuthorisationRequest(sessionId, requestToken, privileges); if (canceled) Index: trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 2877) @@ -203,5 +203,5 @@ protected JPanel buildTitlePanel() { JPanel pnl = new JPanel(new BorderLayout()); - JLabel lbl = new JLabel(tr("Step 2/3: Authorise and retrieve an Access Token")); + JLabel lbl = new JLabel(tr("Step 2/3: Authorize and retrieve an Access Token")); lbl.setFont(lbl.getFont().deriveFont(16f)); pnl.add(lbl, BorderLayout.CENTER); @@ -220,9 +220,9 @@ html.setText(tr("" + "JOSM successfully retrieved a Request Token. " - + "JOSM is now launching an authorisation page in an external browser. " + + "JOSM is now launching an authorization 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 " + + "to authorize the Request Token. Then switch back to this dialog and click on " + "{0}

" - + "If launching the external browser fails you can copy the following authorise URL " + + "If launching the external browser fails you can copy the following authorize URL " + "and paste it into the address field of your browser.", tr("Request Access Token") @@ -234,5 +234,5 @@ gc.weightx = 0.0; gc.gridwidth = 1; - pnl.add(new JLabel(tr("Authorise URL:")), gc); + pnl.add(new JLabel(tr("Authorize URL:")), gc); gc.gridx = 1; @@ -307,5 +307,5 @@ + "JOSM has successfully retrieved an Access Token. " + "You can now accept this token. JOSM will use it in the future for authentication " - + "and authorisation to the OSM server.

" + + "and authorization to the OSM server.

" + "The access token is: " )); Index: trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (revision 2877) @@ -164,5 +164,5 @@ + "Failed to access the OSM server ''{0}''
" + "with the Access Token ''{0}''.
" - + "The server rejected the Access Token as unauthorised. You will not
" + + "The server rejected the Access Token as unauthorized. You will not
" + "be able to access any protected resource on this server using this token." +"", Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 2876) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 2877) @@ -184,5 +184,5 @@ gc.weightx = 1.0; JLabel lbl; - add(lbl = new JMultilineLabel(tr("You do not have an Access Token yet to access the OSM server using OAuth. Please authorise first.")), gc); + add(lbl = new JMultilineLabel(tr("You do not have an Access Token yet to access the OSM server using OAuth. Please authorize first.")), gc); lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN)); @@ -303,6 +303,6 @@ private class AuthoriseNowAction extends AbstractAction { public AuthoriseNowAction() { - putValue(NAME, tr("Authorise now")); - putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorisation process")); + putValue(NAME, tr("Authorize now")); + putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth")); @@ -329,5 +329,5 @@ public RenewAuthorisationAction() { putValue(NAME, tr("New Access Token")); - putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorisation process and generate a new Access Token")); + putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));