Changeset 2877 in josm for trunk


Ignore:
Timestamp:
2010-01-18T22:28:36+01:00 (10 years ago)
Author:
mjulius
Message:

authorise --> authorize in localized messages
fixed typo

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

    r2804 r2877  
    9999        gc.gridx = 0;
    100100        gc.weightx = 0.0;
    101         add(new JLabel(tr("Authorise URL:")), gc);
     101        add(new JLabel(tr("Authorize URL:")), gc);
    102102
    103103        gc.gridx = 1;
  • trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java

    r2861 r2877  
    7373                        "<html>Run a fully automatic procedure to get an access token from the OSM website.<br>"
    7474                        + "JOSM accesses the OSM website on behalf of the JOSM user and fully<br>"
    75                         + "automatically authorises the user and retrieves an Access Token.</html>"
     75                        + "automatically authorizes the user and retrieves an Access Token.</html>"
    7676                ));
    7777                break;
  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r2861 r2877  
    331331    class RunAuthorisationAction extends AbstractAction implements DocumentListener{
    332332        public RunAuthorisationAction() {
    333             putValue(NAME, tr("Authorise now"));
     333            putValue(NAME, tr("Authorize now"));
    334334            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
    335             putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorisation form on the JOSM web site"));
     335            putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorization form on the JOSM web site"));
    336336            updateEnabledState();
    337337        }
     
    364364        public BackAction() {
    365365            putValue(NAME, tr("Back"));
    366             putValue(SHORT_DESCRIPTION, tr("Run the automatic authorisation steps again"));
     366            putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again"));
    367367            putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
    368368        }
     
    440440
    441441        public FullyAutomaticAuthorisationTask(Component parent) {
    442             super(parent, tr("Authorise JOSM to access the OSM API"), false /* don't ignore exceptions */);
     442            super(parent, tr("Authorize JOSM to access the OSM API"), false /* don't ignore exceptions */);
    443443        }
    444444
     
    457457                            + "The automatic process for retrieving an OAuth Access Token<br>"
    458458                            + "from the OSM server failed.<br><br>"
    459                             + "Please try again or choose another kind of authorisation process,<br>"
    460                             + "i.e. semi-automatic or manual authorisation."
     459                            + "Please try again or choose another kind of authorization process,<br>"
     460                            + "i.e. semi-automatic or manual authorization."
    461461                            +"</html>"
    462462                    ),
    463                     tr("OAuth authorisation failed"),
     463                    tr("OAuth authorization failed"),
    464464                    JOptionPane.ERROR_MESSAGE,
    465465                    HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
     
    473473                            + "The automatic process for retrieving an OAuth Access Token<br>"
    474474                            + "from the OSM server failed because JOSM was not able to build<br>"
    475                             + "a valid login URL from the OAuth Authorise Endpoint URL ''{0}''.<br><br>"
     475                            + "a valid login URL from the OAuth Authorize Endpoint URL ''{0}''.<br><br>"
    476476                            + "Please check your advanced setting and try again."
    477477                            + "</html>",
    478478                            getAdvancedPropertiesPanel().getAdvancedParameters().getAuthoriseUrl()
    479479                    ),
    480                     tr("OAuth authorisation failed"),
     480                    tr("OAuth authorization failed"),
    481481                    JOptionPane.ERROR_MESSAGE,
    482482                    HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
     
    503503                            getOsmUserName()
    504504                    ),
    505                     tr("OAuth authorisation failed"),
     505                    tr("OAuth authorization failed"),
    506506                    JOptionPane.ERROR_MESSAGE,
    507507                    HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
  • trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

    r2861 r2877  
    5656        pnlMessage= new HtmlPanel();
    5757        pnlMessage.setText("<html><body>"
    58                 + tr("Please enter an OAuth Access Token which is authorised to access the OSM server "
     58                + tr("Please enter an OAuth Access Token which is authorized to access the OSM server "
    5959                + "''{0}''.",
    6060                getApiUrl()) + "</body></html>");
     
    138138        super.setApiUrl(apiUrl);
    139139        pnlMessage.setText(tr("<html><body>"
    140                 + "Please enter an OAuth Access Token which is authorised to access the OSM server "
     140                + "Please enter an OAuth Access Token which is authorized to access the OSM server "
    141141                + "''{0}''."
    142142                + "</body></html>",
  • trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

    r2861 r2877  
    119119        gc.gridwidth = 1;
    120120        gc.weightx = 0.0;
    121         lbl = new JLabel(tr("Please select an authorisation procedure: "));
     121        lbl = new JLabel(tr("Please select an authorization procedure: "));
    122122        lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
    123123        pnl.add(lbl,gc);
     
    338338            putValue(NAME, tr("Cancel"));
    339339            putValue(SMALL_ICON, ImageProvider.get("cancel"));
    340             putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorisation"));
     340            putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorization"));
    341341        }
    342342
  • trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

    r2861 r2877  
    435435            int retCode = connection.getResponseCode();
    436436            if (retCode != HttpURLConnection.HTTP_MOVED_TEMP)
    437                 throw new OsmOAuthAuthorizationException(tr("Failed to authorise OAuth request  ''{0}''", requestToken.getKey()));
     437                throw new OsmOAuthAuthorizationException(tr("Failed to authorize OAuth request  ''{0}''", requestToken.getKey()));
    438438        } catch(MalformedURLException e) {
    439439            throw new OsmOAuthAuthorizationException(e);
     
    482482        }
    483483        try {
    484             monitor.beginTask(tr("Authorising OAuth Request token ''{0}'' at the OSM website ...", requestToken.getKey()));
     484            monitor.beginTask(tr("Authorizing OAuth Request token ''{0}'' at the OSM website ...", requestToken.getKey()));
    485485            monitor.setTicksCount(4);
    486486            monitor.indeterminateSubTask(tr("Initializing a session at the OSM website..."));
     
    496496            monitor.worked(1);
    497497
    498             monitor.indeterminateSubTask(tr("Authorising request token ''{0}''...", requestToken.getKey()));
     498            monitor.indeterminateSubTask(tr("Authorizing request token ''{0}''...", requestToken.getKey()));
    499499            sendAuthorisationRequest(sessionId, requestToken, privileges);
    500500            if (canceled)
  • trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

    r2861 r2877  
    203203        protected JPanel buildTitlePanel() {
    204204            JPanel pnl = new JPanel(new BorderLayout());
    205             JLabel lbl = new JLabel(tr("<html>Step 2/3: Authorise and retrieve an Access Token</html>"));
     205            JLabel lbl = new JLabel(tr("<html>Step 2/3: Authorize and retrieve an Access Token</html>"));
    206206            lbl.setFont(lbl.getFont().deriveFont(16f));
    207207            pnl.add(lbl, BorderLayout.CENTER);
     
    220220            html.setText(tr("<html>"
    221221                    + "JOSM successfully retrieved a Request Token. "
    222                     + "JOSM is now launching an authorisation page in an external browser. "
     222                    + "JOSM is now launching an authorization page in an external browser. "
    223223                    + "Please login with your OSM username and password and follow the instructions "
    224                     + "to authorise the Request Token. Then switch back to this dialog and click on "
     224                    + "to authorize the Request Token. Then switch back to this dialog and click on "
    225225                    + "<strong>{0}</strong><br><br>"
    226                     + "If launching the external browser fails you can copy the following authorise URL "
     226                    + "If launching the external browser fails you can copy the following authorize URL "
    227227                    + "and paste it into the address field of your browser.</html>",
    228228                    tr("Request Access Token")
     
    234234            gc.weightx = 0.0;
    235235            gc.gridwidth = 1;
    236             pnl.add(new JLabel(tr("Authorise URL:")), gc);
     236            pnl.add(new JLabel(tr("Authorize URL:")), gc);
    237237
    238238            gc.gridx = 1;
     
    307307                    + "JOSM has successfully retrieved an Access Token. "
    308308                    + "You can now accept this token. JOSM will use it in the future for authentication "
    309                     + "and authorisation to the OSM server.<br><br>"
     309                    + "and authorization to the OSM server.<br><br>"
    310310                    + "The access token is: </html>"
    311311            ));
  • trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

    r2861 r2877  
    164164                        + "Failed to access the OSM server ''{0}''<br>"
    165165                        + "with the Access Token ''{0}''.<br>"
    166                         + "The server rejected the Access Token as unauthorised. You will not<br>"
     166                        + "The server rejected the Access Token as unauthorized. You will not<br>"
    167167                        + "be able to access any protected resource on this server using this token."
    168168                        +"</html>",
  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

    r2861 r2877  
    184184            gc.weightx = 1.0;
    185185            JLabel lbl;
    186             add(lbl = new JMultilineLabel(tr("You do not have an Access Token yet to access the OSM server using OAuth. Please authorise first.")), gc);
     186            add(lbl = new JMultilineLabel(tr("You do not have an Access Token yet to access the OSM server using OAuth. Please authorize first.")), gc);
    187187            lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
    188188
     
    303303    private class AuthoriseNowAction extends AbstractAction {
    304304        public AuthoriseNowAction() {
    305             putValue(NAME, tr("Authorise now"));
    306             putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorisation process"));
     305            putValue(NAME, tr("Authorize now"));
     306            putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process"));
    307307            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
    308308
     
    329329        public RenewAuthorisationAction() {
    330330            putValue(NAME, tr("New Access Token"));
    331             putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorisation process and generate a new Access Token"));
     331            putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token"));
    332332            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
    333333
Note: See TracChangeset for help on using the changeset viewer.