Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 19552) +++ applications/editors/josm/i18n/po/ar.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-14 14:29-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -21,5 +21,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -32,12 +32,12 @@ msgstr "المساعدة" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "تجاهل URL ملف غيرصحيح التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -93,9 +93,9 @@ msgstr "التحذير" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3812,9 +3812,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "" @@ -3851,38 +3851,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "حمّل التفضيلات" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "حمّل التفضيلات الحالية إلى الخادم" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "سلسلة النص" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "إسم المستخدم." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "كلمة المرور أو.أس.أم." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "غيّر قياس البريمج إلى الهندسة المحددة (تصميم عرضxطول)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "السلسلة؛السلسلة؛..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3890,5 +3890,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3896,5 +3896,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3902,18 +3902,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "أيّ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "إسم المستخدم" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4031,9 +4031,9 @@ msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5264,8 +5264,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10022,6 +10023,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "المؤلف" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10059,5 +10061,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." msgstr "" @@ -10111,9 +10113,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "المؤلف" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10124,5 +10127,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10156,5 +10159,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10163,5 +10166,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10169,5 +10172,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "" @@ -10177,5 +10180,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10192,5 +10195,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10219,5 +10222,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10248,6 +10251,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "الرجاء إختيار أربعة عقد على الأقل." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10257,6 +10261,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "أغلق الحوار و الغي التنزيل" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10292,10 +10297,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10311,5 +10316,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10406,5 +10411,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10417,9 +10422,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10438,5 +10443,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10487,5 +10492,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11674,5 +11679,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11686,5 +11691,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11695,5 +11700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13370,6 +13375,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/bg.po =================================================================== --- applications/editors/josm/i18n/po/bg.po (revision 19552) +++ applications/editors/josm/i18n/po/bg.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-14 14:48-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Помощ" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнориране неправилен адрес на файл: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Внимание" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3862,10 +3862,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Връзката се разпадна." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Връзката се разпадна." @@ -3902,38 +3903,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Параметри при качване" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Качете текущите параметри на сървъра" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "низ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Потребителско име" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM парола" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "низ;низ;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3943,5 +3944,5 @@ "lat=y&lon=x&zoom=z, или име на файл." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3951,5 +3952,5 @@ "съдържаща lat=y&lon=x&zoom=z или име на файл" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3959,18 +3960,18 @@ "URL препратка, връщаща osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "всеки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Ако е указано, да се нулира конфигурацията вместо да се прочете." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Потребителско име" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4088,9 +4089,9 @@ msgstr "Създаване на интерфейса" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Зареждане на разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5315,8 +5316,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10086,6 +10088,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Автор" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10123,5 +10126,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." msgstr "" @@ -10175,9 +10178,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Автор" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10188,5 +10192,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10220,5 +10224,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10227,5 +10231,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10233,6 +10237,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Връзката се разпадна." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10241,5 +10246,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10256,5 +10261,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10283,5 +10288,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10312,6 +10317,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Моля изберете поне четири точки." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10321,6 +10327,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10356,10 +10363,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10375,5 +10382,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10470,5 +10477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10481,9 +10488,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10502,5 +10509,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10551,5 +10558,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11802,5 +11809,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11814,5 +11821,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11823,5 +11830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13498,6 +13505,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/cs.po =================================================================== --- applications/editors/josm/i18n/po/cs.po (revision 19552) +++ applications/editors/josm/i18n/po/cs.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-14 19:02-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoruji poškozený soubor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Varování" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3882,10 +3882,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Spojení selhalo." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Spojení selhalo." @@ -3922,38 +3923,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Nahrát nastavení" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Nahrát současné nastavení na server" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "řetězec" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Jméno uživatele." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Heslo OSM." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Změnit velkost appletu (formát: ŠÍŘKAxVÝŠKA)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "řetězec;řetězec;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3963,5 +3964,5 @@ "nebo název souboru." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3971,5 +3972,5 @@ "at=y&lon=x&zoom=z nebo název souboru." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3979,18 +3980,18 @@ "jako na Googlu nebo URL vracející osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "cokoliv" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Pokud je nastaveno, smaže se konfigurace, místo jejího načtení" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Jméno uživatele" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4108,9 +4109,9 @@ msgstr "Vytváří se grafické rozhraní programu (GUI)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Načítám pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5370,8 +5371,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10234,6 +10236,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10271,5 +10274,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." msgstr "" @@ -10323,9 +10326,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10336,5 +10340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10368,5 +10372,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10375,5 +10379,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10381,6 +10385,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Spojení selhalo." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10389,5 +10394,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10404,5 +10409,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10431,5 +10436,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10460,6 +10465,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Vyberte minimálně 4 uzly" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10469,6 +10475,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Zavřít dialog a ukončit stahování" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10504,10 +10511,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10522,7 +10529,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 -#, java-format -msgid "Authorising request token ''{0}''..." -msgstr "" +#, fuzzy, java-format +msgid "Authorizing request token ''{0}''..." +msgstr "Chybějící povinný atribut ''{0}''." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 @@ -10618,5 +10625,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10629,9 +10636,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10650,5 +10657,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10699,5 +10706,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11901,5 +11908,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11913,5 +11920,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11922,5 +11929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13622,6 +13629,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/da.po =================================================================== --- applications/editors/josm/i18n/po/da.po (revision 19552) +++ applications/editors/josm/i18n/po/da.po (revision 19557) @@ -9,6 +9,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" -"PO-Revision-Date: 2010-01-14 19:22-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" +"PO-Revision-Date: 2010-01-18 23:31-0500\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dansk \n" @@ -21,5 +21,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -32,12 +32,12 @@ msgstr "Hjælp" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorerer misformet fil-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -93,9 +93,9 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" accepterer ikke filnavne eller fil-URL'er" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3927,10 +3927,10 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "Autorisation fejlede" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Godkendelse fejlede" @@ -3967,39 +3967,39 @@ msgstr "Forventede ikke-tom værdi for parameter \"{0}\". Fik \"{1}\"." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Upload indstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Upload de nuværende indstillinger til serveren" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "tekststreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Brugerens navn." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM-adgangskode" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" +"Ret størrelsen af programmet til den angivne geometri (format: BREDDExHØJDE)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Ret størrelsen af programmet til den angivne geometri (format: BREDDExHØJDE)" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "tekststreng;tekststreng;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4009,5 +4009,5 @@ "eller et filnavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4017,5 +4017,5 @@ "lat=y&lon=x&zoom=z eller et filnavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4025,18 +4025,18 @@ "søgestreng eller en URL som returnerer OSM-XML" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "enhver" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Hvis angivet, nulstil konfigurationen i stedet for at indlæse den." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Brugernavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4158,9 +4158,9 @@ msgstr "Opretter hovedgrænseflade" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Henter udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5455,8 +5455,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10418,6 +10419,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Autorisér nu" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10455,5 +10457,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." msgstr "" @@ -10520,9 +10522,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" +msgid "Authorize now" msgstr "Autorisér nu" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10533,5 +10535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10565,5 +10567,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "Autorisér JOSM til at få adgang til OSM API'et" @@ -10572,5 +10574,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" "Den automatiske proces for erhvervelse af et OAuth " @@ -10582,5 +10584,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "OAuth autorisation fejlede" @@ -10590,5 +10592,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10613,5 +10615,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10642,5 +10644,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10676,5 +10678,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " +msgid "Please select an authorization procedure: " msgstr "Vælg venligst en autorisationsprocedure: " @@ -10685,5 +10687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "Luk dialogen og annullér autorisationen" @@ -10721,11 +10723,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 -#, java-format -msgid "Failed to authorise OAuth request ''{0}''" -msgstr "" +#, fuzzy, java-format +msgid "Failed to authorize OAuth request ''{0}''" +msgstr "Henter OAuth anmodningsudtryk fra ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "Autoriserer OAuth anmodningsudtrykket ''{0}'' på OSM-websiden ..." @@ -10741,5 +10743,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "Autoriserer anmodningsudtryk ''{0}''..." @@ -10836,5 +10838,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10847,9 +10849,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10869,5 +10871,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" "Du har med succes hentet et OAuth adgangsudtryk fra OSM-websiden. Klik " @@ -10921,5 +10923,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -12179,5 +12181,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -12191,5 +12193,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -12200,5 +12202,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13922,6 +13924,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/de.po =================================================================== --- applications/editors/josm/i18n/po/de.po (revision 19552) +++ applications/editors/josm/i18n/po/de.po (revision 19557) @@ -9,6 +9,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" -"PO-Revision-Date: 2010-01-18 14:56-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" +"PO-Revision-Date: 2010-01-18 23:32-0500\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" @@ -21,5 +21,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -32,12 +32,12 @@ msgstr "Hilfe" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoriere die ungültige Datei-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -93,9 +93,9 @@ msgstr "Warnung" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Der Parameter \"downloadgps\" unterstützt keine Dateinamen oder URLs." -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3985,9 +3985,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "Autorisierung fehlgeschlagen" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Authentifizierung fehlgeschlagen" @@ -4026,38 +4026,38 @@ "wurde: ''{1}'')" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Einstellungen hochladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Aktuelle Einstellungen auf dem OSM-Server speichern" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "Zeichenkette" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Name des Benutzers." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM-Passwort." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Appletgröße auf die angegebenen Werte ändern (Format: BREITExHÖHE)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "Zeichenkette;Zeichenkette;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4067,5 +4067,5 @@ "oder ein Dateiname sein." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4075,5 +4075,5 @@ "lat=y&llon=x&zoom=z oder ein Dateiname sein." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4083,9 +4083,9 @@ "Suchanfrage oder eine URL auf ein osm-xml-Dokument sein." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "jeder" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" @@ -4093,10 +4093,10 @@ "verarbeiten." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Benutzername" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4222,9 +4222,9 @@ msgstr "Hauptfenster erzeugen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5522,11 +5522,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 -#, java-format +#, fuzzy, java-format msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" "Sie haben das Zusammenführen der Unterschiede in diesem Konflikt nicht " @@ -9020,6 +9021,12 @@ "written.
Either select another file for each of them or discard the " "changes.
Layers with non-writable files:" -msgstr[0] "{0} Ebene sollte gespeichert werden, jedoch kann die
zugehörige Datei nicht geschrieben werden.
Wählen Sie eine andere Datei aus oder verwerfen Sie die Änderungen.
Ebene mit schreibgeschützter Datei:" -msgstr[1] "{0} Ebenen sollten gespeichert werden, jedoch sind die
zugehörigen Dateien schreibgeschützt.
Wählen Sie andere Dateien aus oder verwerfen Sie die Änderungen.
Ebenen mit schreibgeschützten Dateien:" +msgstr[0] "" +"{0} Ebene sollte gespeichert werden, jedoch kann die
zugehörige " +"Datei nicht geschrieben werden.
Wählen Sie eine andere Datei aus oder " +"verwerfen Sie die Änderungen.
Ebene mit schreibgeschützter Datei:" +msgstr[1] "" +"{0} Ebenen sollten gespeichert werden, jedoch sind die
zugehörigen " +"Dateien schreibgeschützt.
Wählen Sie andere Dateien aus oder verwerfen " +"Sie die Änderungen.
Ebenen mit schreibgeschützten Dateien:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 @@ -10577,5 +10584,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" +msgid "Authorize URL:" msgstr "Autorisierungs-URL:" @@ -10616,5 +10623,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." msgstr "" @@ -10681,9 +10688,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" +msgid "Authorize now" msgstr "Jetzt autorisieren" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" "Klicken, um zum Autorisierungsformular auf der JOSM-Webseite zu gelangen" @@ -10695,5 +10702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "Die automatischen Autorisierungsschritte erneut starten" @@ -10730,5 +10737,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "JOSM-Zugriff auf OSM-API autorisieren" @@ -10737,5 +10744,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" "Der automatische Erwerb einer OAuth-Zugriffskennung vom OSM-Server ist " @@ -10747,5 +10754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "OAuth-Autorisierung fehlgeschlagen" @@ -10755,5 +10762,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10778,5 +10785,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10807,5 +10814,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10842,5 +10849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " +msgid "Please select an authorization procedure: " msgstr "Bitte wählen Sie eine Autorisierungsmethode: " @@ -10851,5 +10858,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "Dialog schließen und Autorisierung abbrechen" @@ -10888,10 +10895,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "OAuth-Autorisierungsanfrage ''{0}'' fehlgeschlagen." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "Autorisiere OAuth-Anfragekennung ''{0}'' bei der OSM-Webseite ..." @@ -10907,5 +10914,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "Autorisiere Anfragekennung ''{0}''..." @@ -11014,5 +11021,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" "Schritt 2/3: OAuth-Zugriffskennung autorisieren und abrufen" @@ -11026,9 +11033,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -11054,5 +11061,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" "JOSM hat eine erfolgreich eine Zugriffskennung bezogen. Sie können " @@ -11113,5 +11120,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11893,5 +11900,15 @@ "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " "keyboard...

" -msgstr "

Sie werden feststellen, dass die Tastenauswahl auf der nächsten Seite alle Java bekannten Tastaturen enthält und nicht nur die Tasten Ihrer Tastatur. Bitte verwenden Sie nur Tasten, die auf Ihrer Tastatur verfügbar sind. Falls Ihre Tastatur keine ''Copy''-Taste hat (PC-Tastaturen haben diese nicht, aber Sun-Tastaturen), verwenden Sie sie nicht. Außerdem gibt es ''Tasten'', welche auf der Tastatur Abkürzungen entsprechen (z.B. '':''/Doppelpunkt). Bitte verwenden Sie diese nicht, sondern die Basistaste (''.''/Punkt auf der deutschen Tastatur, ...). Falls Sie dies nicht tun, kann es Konflikte geben, da JOSM nicht erkennt, dass Strg+Umschalt+. und Strg+: das gleiche ist...

" +msgstr "" +"

Sie werden feststellen, dass die Tastenauswahl auf der nächsten Seite " +"alle Java bekannten Tastaturen enthält und nicht nur die Tasten Ihrer " +"Tastatur. Bitte verwenden Sie nur Tasten, die auf Ihrer Tastatur verfügbar " +"sind. Falls Ihre Tastatur keine ''Copy''-Taste hat (PC-Tastaturen haben " +"diese nicht, aber Sun-Tastaturen), verwenden Sie sie nicht. Außerdem gibt es " +"''Tasten'', welche auf der Tastatur Abkürzungen entsprechen (z.B. '':''/" +"Doppelpunkt). Bitte verwenden Sie diese nicht, sondern die Basistaste (''.''/" +"Punkt auf der deutschen Tastatur, ...). Falls Sie dies nicht tun, kann es " +"Konflikte geben, da JOSM nicht erkennt, dass Strg+Umschalt+. und Strg+: das " +"gleiche ist...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177 @@ -12413,5 +12430,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" "Es gibt noch keine Zugriffskennung für den Zugriff mittels OAuth auf den OSM-" @@ -12429,5 +12446,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "Den OAuth-Autorisierungsprozess starten" @@ -12438,5 +12455,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -12683,5 +12700,7 @@ "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server " "capabilities. Got ''{2}''" -msgstr "Warnung: ungültiger Wert des Attributs ''{0}'' von Element ''{1}'' der Servermöglichkeiten. ''{2}''" +msgstr "" +"Warnung: ungültiger Wert des Attributs ''{0}'' von Element ''{1}'' der " +"Servermöglichkeiten. ''{2}''" #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 @@ -12981,5 +13000,7 @@ #, java-format msgid "No primitive with id {0} in local dataset. Cannot infer primitive type." -msgstr "Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Der Typ kann daher nicht bestimmt werden." +msgstr "" +"Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Der Typ kann " +"daher nicht bestimmt werden." #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 @@ -14153,5 +14174,8 @@ "are running the latest
version of JOSM, please consider being kind and " "file a bug report." -msgstr "Ein unerwarteter Fehler trat auf.
Dies ist immer ein Programmierfehler. Falls Sie die
aktuelle Version von JOSM einsetzen, würden wir
uns über einen Fehlerbericht freuen." +msgstr "" +"Ein unerwarteter Fehler trat auf.
Dies ist immer ein Programmierfehler. " +"Falls Sie die
aktuelle Version von JOSM einsetzen, würden wir
uns über " +"einen Fehlerbericht freuen." #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 @@ -14218,5 +14242,9 @@ "configured.
Please open the Preferences Dialog and generate or enter an " "Access Token." -msgstr "Die Anmeldung beim OSM-Server \"{0}\" ist fehlgeschlagen.
Sie verwenden OAuth zur Authentifizierung, aber es ist keine
OAuth-Zugriffskennung eingerichtet. Rufen Sie bitte den
Einstellungsdialog auf, um eine Zugriffskennung zu erzeugen
oder einzugeben." +msgstr "" +"Die Anmeldung beim OSM-Server \"{0}\" ist fehlgeschlagen.
Sie " +"verwenden OAuth zur Authentifizierung, aber es ist keine
OAuth-" +"Zugriffskennung eingerichtet. Rufen Sie bitte den
Einstellungsdialog auf, " +"um eine Zugriffskennung zu erzeugen
oder einzugeben." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77 @@ -14268,6 +14296,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/el.po =================================================================== --- applications/editors/josm/i18n/po/el.po (revision 19552) +++ applications/editors/josm/i18n/po/el.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-15 13:57-0500\n" "Last-Translator: alichani \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Βοήθεια" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Προειδοποίηση" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3783,10 +3783,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Η σύνδεση απέτυχε." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Η σύνδεση απέτυχε." @@ -3823,38 +3824,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Αποστολή προτιμήσεων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Αποστολή των τρεχουσών προτιμήσεων στον διακομιστή" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "συμβολοσειρά" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Όνομα χρήστη." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Κωδικός OSM." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "συμβολοσειρά;συμβολοσειρά;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3864,5 +3865,5 @@ "lat=y&lon=x&zoom=z ή το όνομα ενός αρχείου" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3870,5 +3871,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3876,18 +3877,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "οποιοδήποτε" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Άν δοθεί, επαναφορά των ρυθμίσεων αντί για ανάγνωση τους." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Όνομα χρήστη" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4005,9 +4006,9 @@ msgstr "Δημιουργία κύριου GUI" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Φόρτωση πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5223,8 +5224,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -9960,6 +9962,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Συγγραφέας" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -9997,5 +10000,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." msgstr "" @@ -10049,9 +10052,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Συγγραφέας" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10062,5 +10066,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10094,5 +10098,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10101,5 +10105,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10107,6 +10111,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Η σύνδεση απέτυχε." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10115,5 +10120,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10130,5 +10135,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10157,5 +10162,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10186,6 +10191,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10195,6 +10201,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10230,10 +10237,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10249,5 +10256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10344,5 +10351,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10355,9 +10362,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10376,5 +10383,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10425,5 +10432,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11625,5 +11632,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11637,5 +11644,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11646,5 +11653,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13320,6 +13327,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/en_GB.po =================================================================== --- applications/editors/josm/i18n/po/en_GB.po (revision 19552) +++ applications/editors/josm/i18n/po/en_GB.po (revision 19557) @@ -11,6 +11,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" -"PO-Revision-Date: 2010-01-18 15:03-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" +"PO-Revision-Date: 2010-01-18 23:35-0500\n" "Last-Translator: Matthias Julius \n" "Language-Team: German \n" @@ -23,5 +23,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -34,12 +34,12 @@ msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoring malformed file URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -95,9 +95,9 @@ msgstr "Warning" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" does not accept file names or file URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3917,9 +3917,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "Authorisation Failed" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Authentication failed" @@ -3956,38 +3956,38 @@ msgstr "Expected non-empty value for parameter ''{0}'', got ''{1}''" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Upload Preferences" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Upload the current preferences to the server" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "string" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Name of the user." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM Password." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "string;string;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3997,5 +3997,5 @@ "filename" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4005,5 +4005,5 @@ "lat=y&lon=x&zoom=z or a filename" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4013,18 +4013,18 @@ "URL which returns osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "any" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "If specified, reset the configuration instead of reading it." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Username" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4148,9 +4148,9 @@ msgstr "Creating main GUI" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Loading plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5421,11 +5421,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216 -#, java-format +#, fuzzy, java-format msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" "You did not finish to merge the differences in this conflict." @@ -8865,6 +8866,12 @@ "written.
Either select another file for each of them or discard the " "changes.
Layers with non-writable files:" -msgstr[0] "{0} layer needs saving but has an associated file
which cannot be written.
Either select another file for this layer or discard the changes.
Layer with a non-writable file:" -msgstr[1] "{0} layers need saving but have associated files
which cannot be written.
Either select another file for each of them or discard the changes.
Layers with non-writable files:" +msgstr[0] "" +"{0} layer needs saving but has an associated file
which cannot be " +"written.
Either select another file for this layer or discard the changes." +"
Layer with a non-writable file:" +msgstr[1] "" +"{0} layers need saving but have associated files
which cannot be " +"written.
Either select another file for each of them or discard the " +"changes.
Layers with non-writable files:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 @@ -10387,5 +10394,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" +msgid "Authorize URL:" msgstr "Authorise URL:" @@ -10426,5 +10433,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." msgstr "" @@ -10492,9 +10499,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" +msgid "Authorize now" msgstr "Authorise now" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "Click to redirect you to the authorisation form on the JOSM web site" @@ -10505,5 +10512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "Run the automatic authorisation steps again" @@ -10537,21 +10544,21 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "Authorise JOSM to access the OSM API" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456 msgid "" +"The automatic process for retrieving an OAuth Access Token
from the " +"OSM server failed.

Please try again or choose another kind of " +"authorization process,
i.e. semi-automatic or manual authorization." +msgstr "" "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." -msgstr "" -"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." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:463 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "OAuth authorisation failed" @@ -10559,13 +10566,13 @@ #, java-format msgid "" +"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 Authorize Endpoint URL ''{0}''.

Please check your " +"advanced setting and try again." +msgstr "" "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}''.

Please check your " "advanced setting and try again." -msgstr "" -"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}''.

Please check your " -"advanced setting and try again." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496 @@ -10583,5 +10590,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10612,5 +10619,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10646,5 +10653,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " +msgid "Please select an authorization procedure: " msgstr "Please select an authorisation procedure: " @@ -10655,5 +10662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "Close the dialog and cancel authorisation" @@ -10691,10 +10698,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "Failed to authorise OAuth request ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "Authorising OAuth Request token ''{0}'' at the OSM website ..." @@ -10710,5 +10717,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "Authorising request token ''{0}''..." @@ -10809,5 +10816,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "Step 2/3: Authorise and retrieve an Access Token" @@ -10819,4 +10826,12 @@ #, java-format msgid "" +"JOSM successfully retrieved a Request Token. JOSM is now launching an " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 authorize URL and paste it into the address field of your browser." +"" +msgstr "" "JOSM successfully retrieved a Request Token. JOSM is now launching an " "authorisation page in an external browser. Please login with your OSM " @@ -10826,12 +10841,4 @@ "following authorise URL and paste it into the address field of your browser." "" -msgstr "" -"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 {0}

If launching the external browser fails you can copy the " -"following authorise URL and paste it into the address field of your browser." -"" #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275 @@ -10848,5 +10855,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" "JOSM has successfully retrieved an Access Token. You can now accept " @@ -10903,5 +10910,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11664,5 +11671,16 @@ "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " "keyboard...

" -msgstr "

You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards Java knows about, not just those keys that exist on your keyboard. Please use only those values that correspond to a real key on your keyboard. So if your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), the do not use it. Also there will be ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). Please also do not use them, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" +msgstr "" +"

You may notice that the key selection list on the next page lists all " +"keys that exist on all kinds of keyboards Java knows about, not just those " +"keys that exist on your keyboard. Please use only those values that " +"correspond to a real key on your keyboard. So if your keyboard has no " +"''Copy'' key (PC keyboard do not have them, Sun keyboards do), the do not " +"use it. Also there will be ''keys'' listed that correspond to a shortcut on " +"your keyboard (e.g. '':''/Colon). Please also do not use them, use the base " +"key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) " +"instead. Not doing so may result in conflicts, as there is no way for JOSM " +"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " +"keyboard...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177 @@ -12171,5 +12189,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" "You do not have an Access Token yet to access the OSM server using OAuth. " @@ -12185,5 +12203,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "Click to step through the OAuth authorisation process" @@ -12194,5 +12212,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -12290,5 +12308,7 @@ "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 "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 "" +"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''" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 @@ -12433,5 +12453,7 @@ "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server " "capabilities. Got ''{2}''" -msgstr "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server capabilities. Got ''{2}''" +msgstr "" +"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server " +"capabilities. Got ''{2}''" #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83 @@ -12722,5 +12744,6 @@ #, java-format msgid "No primitive with id {0} in local dataset. Cannot infer primitive type." -msgstr "No primitive with id {0} in local dataset. Cannot infer primitive type." +msgstr "" +"No primitive with id {0} in local dataset. Cannot infer primitive type." #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 @@ -13853,5 +13876,8 @@ "are running the latest
version of JOSM, please consider being kind and " "file a bug report." -msgstr "An unexpected exception occurred.
This is always a coding error. If you are running the latest
version of JOSM, please consider being kind and file a bug report." +msgstr "" +"An unexpected exception occurred.
This is always a coding error. If you " +"are running the latest
version of JOSM, please consider being kind and " +"file a bug report." #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 @@ -13917,5 +13943,9 @@ "configured.
Please open the Preferences Dialog and generate or enter an " "Access Token." -msgstr "Failed to authenticate at the OSM server ''{0}''.
You are using OAuth to authenticate but currently there is no
OAuth Access Token configured.
Please open the Preferences Dialog and generate or enter an Access Token." +msgstr "" +"Failed to authenticate at the OSM server ''{0}''.
You are using " +"OAuth to authenticate but currently there is no
OAuth Access Token " +"configured.
Please open the Preferences Dialog and generate or enter an " +"Access Token." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77 @@ -13966,6 +13996,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/es.po =================================================================== --- applications/editors/josm/i18n/po/es.po (revision 19552) +++ applications/editors/josm/i18n/po/es.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 00:48-0500\n" "Last-Translator: Leo Arias \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Ayuda" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de archivo malformado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,10 +92,10 @@ msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "El parámetro \"downloadgps\" no acepta nombres de archivo o URLs de archivo." -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3944,10 +3944,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Conexión fallida." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Conexión fallida." @@ -3984,38 +3985,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Subir preferencias" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Subir las preferencias actuales al servidor" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "cadena de caracteres" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Nombre del usuario." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Contraseña de OSM" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Reescale a la geometría dada ( formato: ANCHO x ALTO )" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "cadena;cadena;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4025,5 +4026,5 @@ "lat=y&lon=x&zoom=z o un archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4033,5 +4034,5 @@ "contenga lat=y&lon=x&zoom=z o un nombre de archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4041,18 +4042,18 @@ "estilo google o una URL que devuelva xml de osm" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "cualquier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Si se especifica, reinicie la configuración en lugar de leerla." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nombre de usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4170,9 +4171,9 @@ msgstr "Creando la interfaz principal de usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Cargando los complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5449,8 +5450,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10269,6 +10271,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10306,5 +10309,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." msgstr "" @@ -10358,9 +10361,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10371,5 +10375,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10403,5 +10407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10410,5 +10414,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10416,6 +10420,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Conexión fallida." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10424,5 +10429,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10439,5 +10444,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10466,5 +10471,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10495,6 +10500,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Por favor, selecciona al menos cuatro nodos." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10504,6 +10510,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Cerrar cuadro de diálogo y cancelar la descarga" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10539,10 +10546,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10558,5 +10565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10653,5 +10660,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10664,9 +10671,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10685,5 +10692,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10734,5 +10741,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11995,5 +12002,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -12007,5 +12014,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -12016,5 +12023,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13719,6 +13726,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 19552) +++ applications/editors/josm/i18n/po/et.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 00:53-0500\n" "Last-Translator: Margus Värton \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoreerin vigast faili URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Hoiatus" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3790,9 +3790,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "" @@ -3829,38 +3829,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Üleslaadimise valikud" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Lae käesolikud valikud serverisse" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "tekst" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Kasutajanimi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM salasõna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Muuda apleti suurus antud mõõtu (formaat: LAIUSxKÕRGUS)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "tekst;tekst;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3870,5 +3870,5 @@ "lat=y&lon=x&zoom=z või failinime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3878,5 +3878,5 @@ "lat=y&lon=x&zoom=z või failinime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3886,18 +3886,18 @@ "mis tagastab osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "iga" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Kui määratud, lähtestab konfiguratsiooni selle lugemise asemel." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Kasutajanimi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4015,9 +4015,9 @@ msgstr "Loon kasutajaliidest" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Pistikrakenduste laadimine" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5229,8 +5229,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -9947,6 +9948,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -9984,5 +9986,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." msgstr "" @@ -10036,9 +10038,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10049,5 +10052,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10081,5 +10084,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10088,5 +10091,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10094,5 +10097,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "" @@ -10102,5 +10105,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10117,5 +10120,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10144,5 +10147,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10173,6 +10176,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Palun vali vähemalt neli sõlme." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10182,6 +10186,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Sule dialoogiaken ja katkesta allalaadimine" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10217,10 +10222,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10236,5 +10241,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10331,5 +10336,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10342,9 +10347,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10363,5 +10368,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10412,5 +10417,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11597,5 +11602,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11609,5 +11614,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11618,5 +11623,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13272,6 +13277,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/fi.po =================================================================== --- applications/editors/josm/i18n/po/fi.po (revision 19552) +++ applications/editors/josm/i18n/po/fi.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:05-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 00:59-0500\n" "Last-Translator: Matti Kujala \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Ohje" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Varoitus" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3837,10 +3837,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Yhteys epäonnistui" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Yhteys epäonnistui" @@ -3877,38 +3878,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Lähetä asetukset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Lähetä nykyiset asetukset palvelimelle" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "merkkijono" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Käyttäjän nimi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM:n salasana." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Muuta sovelman koko annetuksi (muoto: LEVEYSxKORKEUS)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "merkkijono;merkkijono;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3916,5 +3917,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3922,5 +3923,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3928,18 +3929,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "mikä tahansa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Jos määritetty, nollaa asetukset niiden lukemisen sijaan." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Käyttäjänimi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4057,9 +4058,9 @@ msgstr "Luodaan pääikkuna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Ladataan liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5271,8 +5272,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10038,6 +10040,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Tekijä" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10075,5 +10078,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." msgstr "" @@ -10127,9 +10130,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Tekijä" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10140,5 +10144,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10172,5 +10176,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10179,5 +10183,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10185,6 +10189,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Yhteys epäonnistui" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10193,5 +10198,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10208,5 +10213,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10235,5 +10240,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10264,6 +10269,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Valitse ainakin neljä pistettä." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10273,6 +10279,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Sulje ikkuna ja peruuta lataus" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10308,10 +10315,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10327,5 +10334,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10422,5 +10429,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10433,9 +10440,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10454,5 +10461,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10503,5 +10510,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11715,5 +11722,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11727,5 +11734,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11736,5 +11743,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13403,6 +13410,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 19552) +++ applications/editors/josm/i18n/po/fr.po (revision 19557) @@ -6,5 +6,5 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:10-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 02:51-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -19,5 +19,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -30,12 +30,12 @@ msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "URL de fichier malformée ignorée : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -91,9 +91,9 @@ msgstr "Avertissement" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3932,10 +3932,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "La connexion a échoué." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "La connexion a échoué." @@ -3972,39 +3973,39 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Charger les préférences" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Charger les préférences actuelles vers le serveur" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "chaîne de caractères" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Nom de l’utilisateur." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Mot de passe OSM." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" +"Redimensionner l’applet aux dimensions suivantes (format : LARGEURxHAUTEUR)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Redimensionner l’applet aux dimensions suivantes (format : LARGEURxHAUTEUR)" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "texte;texte;…" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4014,5 +4015,5 @@ "contenant lat=y&lon=x&zoom=z ou encore un nom de fichier." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4022,5 +4023,5 @@ "y2·un·URL·contenant·lat=y&lon=x&zoom=z ou un nom de fichier." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4030,19 +4031,19 @@ "caractères comme pour Google ou un URL retournant du osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "n’importe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nom d’utilisateur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4160,9 +4161,9 @@ msgstr "Création de l’interface graphique de l’utilisateur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Chargement des greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5427,8 +5428,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10278,6 +10280,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Auteur" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10315,5 +10318,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." msgstr "" @@ -10367,9 +10370,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Auteur" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10380,5 +10384,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10412,5 +10416,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10419,5 +10423,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10425,6 +10429,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "La connexion a échoué." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10433,5 +10438,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10448,5 +10453,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10475,5 +10480,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10504,6 +10509,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Veuillez sélectionner au moins quatre nœuds." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10513,6 +10519,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +msgid "Close the dialog and cancel authorization" +msgstr "Fermer cette fenêtre et annuler le téléchargement" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10548,10 +10555,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10566,7 +10573,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 -#, java-format -msgid "Authorising request token ''{0}''..." -msgstr "" +#, fuzzy, java-format +msgid "Authorizing request token ''{0}''..." +msgstr "Sauvegarde du calque vers ''{0}''…" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 @@ -10662,5 +10669,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10673,9 +10680,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10694,5 +10701,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10743,5 +10750,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -12009,5 +12016,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -12021,5 +12028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -12030,5 +12037,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13730,6 +13737,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 19552) +++ applications/editors/josm/i18n/po/gl.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:11-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 02:57-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de ficheiro mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3819,9 +3819,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "" @@ -3858,38 +3858,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Subir Preferencias" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Subir as preferencias actuais ó servidor" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "cadea" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Nome do usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Contrasinal de OSM." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Redimensionar o applet á xeometría indicada (formato: ANCHOxALTO)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "cadea;cadea;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3899,5 +3899,5 @@ "lat=y&lon=x&zoom=z ou un nome de ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3907,5 +3907,5 @@ "contendo lat=y&lon=x&zoom=z ou un nome de ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3915,18 +3915,18 @@ "google ou unha URL que devolva osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "calquera" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Si se especifica, reestablecer a configuración en lugar de lela." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nome de usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4044,9 +4044,9 @@ msgstr "Creando Interface (GUI) principal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Cargando extensións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5270,8 +5270,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10016,6 +10017,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10053,5 +10055,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." msgstr "" @@ -10105,9 +10107,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10118,5 +10121,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10150,5 +10153,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10157,5 +10160,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10163,5 +10166,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "" @@ -10171,5 +10174,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10186,5 +10189,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10213,5 +10216,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10242,6 +10245,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Por favor, selecciona polo menos catro nodos." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10251,5 +10255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "" @@ -10286,10 +10290,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10305,5 +10309,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10400,5 +10404,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10411,9 +10415,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10432,5 +10436,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10481,5 +10485,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11734,5 +11738,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11746,5 +11750,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11755,5 +11759,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13425,6 +13429,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 19552) +++ applications/editors/josm/i18n/po/he.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:11-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 23:02-0500\n" "Last-Translator: Tsvi Mostovicz \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "אזהרה" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3782,10 +3782,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "ההתחברות נכשלה." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "ההתחברות נכשלה." @@ -3822,38 +3823,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "העלה מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "העלה את המאפיינים הנוכחיים לשרת" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "מחרוזת" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "שם המשתמש." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "סיסמת OSM." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "מחרוזת;מחרוזת;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3863,5 +3864,5 @@ "שם קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3871,5 +3872,5 @@ "lat=y&lon=x&zoom=z או שם קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3879,18 +3880,18 @@ "שמחזירה osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "כלשהו" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "במידה וצויין, אפס את התצורה במקום לקרוא אותה." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "שם משתמש" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4008,9 +4009,9 @@ msgstr "יוצר ממשקי גרפי ראשי" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "טעינת תוספים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5229,8 +5230,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -9957,6 +9959,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "מחבר" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -9994,5 +9997,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." msgstr "" @@ -10046,9 +10049,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "מחבר" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10059,5 +10063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10091,5 +10095,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10098,5 +10102,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10104,6 +10108,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "ההתחברות נכשלה." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10112,5 +10117,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10127,5 +10132,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10154,5 +10159,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10183,6 +10188,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "נא בחר לפחות ארבעה צמתים." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10192,5 +10198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "" @@ -10227,10 +10233,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10246,5 +10252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10341,5 +10347,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10352,9 +10358,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10373,5 +10379,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10422,5 +10428,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11607,5 +11613,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11619,5 +11625,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11628,5 +11634,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13288,6 +13294,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/is.po =================================================================== --- applications/editors/josm/i18n/po/is.po (revision 19552) +++ applications/editors/josm/i18n/po/is.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:11-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" "PO-Revision-Date: 2010-01-17 23:06-0500\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Hjálp" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Aðvörun" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3788,9 +3788,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "" @@ -3827,38 +3827,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Hlaða upp stillingum" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Hlaða JOSM stillingum þínum upp á OSM þjóninn" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "strengur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Notandanafn." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM lykilorð." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3866,5 +3866,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3872,5 +3872,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3878,18 +3878,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Notandanafn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4007,9 +4007,9 @@ msgstr "Bý til aðal notandaviðmót" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Hleð inn viðbótum" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5220,8 +5220,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -9948,6 +9949,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Notandi" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -9985,5 +9987,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." msgstr "" @@ -10037,9 +10039,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +msgid "Authorize now" +msgstr "Notandi" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10050,5 +10053,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10082,5 +10085,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10089,5 +10092,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10095,5 +10098,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "" @@ -10103,5 +10106,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10118,5 +10121,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10145,5 +10148,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10174,6 +10177,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +msgid "Please select an authorization procedure: " +msgstr "Veldu minnst fjóra hnúta" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10183,5 +10187,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "" @@ -10218,10 +10222,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10237,5 +10241,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10332,5 +10336,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10343,9 +10347,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10364,5 +10368,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10413,5 +10417,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11603,5 +11607,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11615,5 +11619,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11624,5 +11628,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13282,6 +13286,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/it.po =================================================================== --- applications/editors/josm/i18n/po/it.po (revision 19552) +++ applications/editors/josm/i18n/po/it.po (revision 19557) @@ -5,6 +5,6 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:14-0500\n" -"PO-Revision-Date: 2010-01-18 00:46-0500\n" +"POT-Creation-Date: 2010-01-19 00:01-0500\n" +"PO-Revision-Date: 2010-01-18 23:39-0500\n" "Last-Translator: Davide Prade \n" "Language-Team: Italian \n" @@ -17,5 +17,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -28,12 +28,12 @@ msgstr "Aiuto" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -89,9 +89,9 @@ msgstr "Attenzione" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3994,10 +3994,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "Autorizzazione fallita" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -#, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Autenticazione fallita" @@ -4036,39 +4035,39 @@ "''''{1}''''" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Carica preferenze" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Carica sul server le attuali preferenze" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Nome dell''utente." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Password OSM." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" +"Ridimensiona l''applet alla geometria data (formato: LARGHEZZAxALTEZZA)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" -"Ridimensiona l''applet alla geometria data (formato: LARGHEZZAxALTEZZA)" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "stringa;stringa;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4078,5 +4077,5 @@ "lat=y&lon=x&zoom=z oppure un nome di file" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4086,5 +4085,5 @@ "contenente lat=y&lon=x&zoom=z oppure un nome di file" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4094,18 +4093,18 @@ "simile a quelel di Google o un URL che restituisce osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "qualsiasi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Se specificato, reimposta la configurazione invece di leggerla." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nome utente" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4224,9 +4223,9 @@ msgstr "Creazione dell''interfaccia principale" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Caricamento estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5540,8 +5539,9 @@ msgid "" "You did not finish to merge the differences in this conflict." -"
Conflict resolutions won't be applied unless all differences
are " +"
Conflict resolutions will not be applied unless all differences
are " "resolved.Click {0} to close anyway." -"Already
resolved differences won't be applied.
Click " -"{1} to return to resolving conflicts." +"Already
resolved differences will not be applied.
Click {1} to return to resolving conflicts." msgstr "" @@ -10638,6 +10638,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +msgid "Authorize URL:" +msgstr "Autorizza adesso" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10675,5 +10676,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." msgstr "" @@ -10727,9 +10728,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" +msgid "Authorize now" msgstr "Autorizza adesso" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" "Cliccare per essere rediretti alla maschera di autorizzazione sul sito web " @@ -10742,5 +10743,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "Esegui nuovamente i passaggi dell''autorizzazione automatica" @@ -10778,5 +10779,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "Autorizza JOSM ad accedere alle API di OSM" @@ -10785,5 +10786,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10791,6 +10792,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Autorizzazione fallita" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10799,5 +10801,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10814,5 +10816,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10841,5 +10843,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10870,5 +10872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " +msgid "Please select an authorization procedure: " msgstr "Si prega di selezionare una procedura di autorizzazione: " @@ -10879,5 +10881,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "Chiudi la finestra ed annulla l''autorizzazione" @@ -10914,11 +10916,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 -#, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." -msgstr "" +#, fuzzy, java-format +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." +msgstr "Inizializzazione della sessione sul sito web OSM..." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486 @@ -10932,7 +10934,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 -#, java-format -msgid "Authorising request token ''{0}''..." -msgstr "" +#, fuzzy, java-format +msgid "Authorizing request token ''{0}''..." +msgstr "Disconnessione della sessione ''''{0}''''..." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 @@ -11028,5 +11030,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -11039,9 +11041,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -11060,5 +11062,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -11109,5 +11111,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -12387,5 +12389,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -12399,5 +12401,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -12408,5 +12410,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -14203,6 +14205,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 19552) +++ applications/editors/josm/i18n/po/ja.po (revision 19557) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:14-0500\n" -"PO-Revision-Date: 2010-01-18 11:05-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" +"PO-Revision-Date: 2010-01-18 23:55-0500\n" "Last-Translator: higa4 \n" "Language-Team: Japanese \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "不正な形式のファイルURL\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,10 +92,10 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -2392,40 +2392,28 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -#, fuzzy msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." -msgstr "" -"ベイカー ストリート - 任意のキーや名前に 'ベイカー' と 'ストリート' を" -"両方含むもの" +msgstr "ベイカー ストリート - 任意のキーや名前に ''ベイカー'' と ''ストリート'' を両方含むもの" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 -#, fuzzy msgid "\"Baker Street\" - ''Baker Street'' in any key or name." -msgstr "" -"\"ベイカー ストリート\" - 任意のキーや名前に 'ベイカー ストリート' を" -"含むもの。" +msgstr "\"ベイカー ストリート\" - 任意のキーや名前に ''ベイカー ストリート'' を含むもの。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 -#, fuzzy msgid "name:Bak - ''Bak'' anywhere in the name." -msgstr "name:Bak - nameタグに 'Bak' を含むもの" +msgstr "name:Bak - nameタグに ''Bak'' を含むもの" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 -#, fuzzy msgid "type=route - key ''type'' with value exactly ''route''." -msgstr "type=route - キー 'type' の値が 'route' であるもの" +msgstr "type=route - キー ''type'' の値が ''route'' であるもの" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 -#, fuzzy msgid "" "type=* - key ''type'' with any value. Try also *=value, " "type=, *=*, *=" -msgstr "" -"type=* - 'type' というキーを持つもの全て。* は任意の文字列を意味しま" -"す。*=value, type=, *=*, *=なども可能です。" +msgstr "type=* - ''type'' というキーを持つもの全て。* は任意の文字列を意味します。*=value, type=, *=*, *=なども可能です。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 -#, fuzzy msgid "-name:Bak - not ''Bak'' in the name." -msgstr "-name:Bak - その名前の内 'Bak' でない。" +msgstr "-name:Bak - その名前の内 ''Bak'' でない。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 @@ -2959,15 +2947,15 @@ #, fuzzy, java-format msgid "Set the ''modified'' flag for node {0}" -msgstr "ノード {0} 用に'変更された'フラグをセット" +msgstr "ノード {0} 用に''変更された''フラグをセット" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42 #, fuzzy, java-format msgid "Set the ''modified'' flag for way {0}" -msgstr "ウェイ {0} 用に'変更された'フラグをセット" +msgstr "ウェイ {0} 用に''変更された''フラグをセット" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43 #, fuzzy, java-format msgid "Set the ''modified'' flag for relation {0}" -msgstr "リレーション {0} 用に'変更された'フラグをセット" +msgstr "リレーション {0} 用に''変更された''フラグをセット" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -3899,10 +3887,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +#| msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "認証失敗" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "認証に失敗しました" @@ -3940,38 +3929,38 @@ "パラメータ \"{0}\" は空白を想定していますが、現在 \"{1}\" になっています。" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "アップロード設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "サーバに現在の設定をアップロードします" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "文字列" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "ユーザの名前" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSMのパスワード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "指定された位置でアプレットのサイズ変更（指定フォーマットは、幅x高さ）" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "文字列：文字列：…" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3981,5 +3970,5 @@ "ル名を指定できます。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3989,5 +3978,5 @@ "かファイル名で指定できます。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3997,18 +3986,18 @@ "すURLで指定できます。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "任意" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "もし指定されると、読み込む代わりに設定をリセットします。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "ユーザ名" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4129,9 +4118,9 @@ msgstr "メインGUIを作成します。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "プラグインのロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -5875,7 +5864,5 @@ "None of the selected objects is available in the current
edit layer " "''{0}''." -msgstr[0] "" -"選択したオブジェクトは現在の編集レイヤー ''{0}' 上にありません。" +msgstr "選択したオブジェクトは現在の編集レイヤー ''{0}'' 上にありません。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331 @@ -10211,6 +10198,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "作者" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10248,5 +10237,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." msgstr "" @@ -10300,9 +10289,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "作者" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10313,5 +10304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10345,5 +10336,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10352,5 +10343,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10358,6 +10349,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +#| msgid "Authorisation Failed" +msgid "OAuth authorization failed" +msgstr "認証失敗" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10366,5 +10359,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10381,5 +10374,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10408,5 +10401,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10437,6 +10430,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "少なくとも４つのノードを選択してください。" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10446,6 +10441,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "ダイアログを閉じてダウンロードをキャンセル" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10481,10 +10478,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10499,7 +10496,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 -#, java-format -msgid "Authorising request token ''{0}''..." -msgstr "" +#, fuzzy, java-format +#| msgid "Missing required attribute ''{0}''." +msgid "Authorizing request token ''{0}''..." +msgstr "必要な属性 ''{0}'' がありません。" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 @@ -10595,5 +10593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10606,9 +10604,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10627,5 +10625,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10676,5 +10674,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11109,9 +11107,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104 -#, fuzzy msgid "" "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to " "draw all lines." -msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。" +msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106 @@ -11120,8 +11117,7 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111 -#, fuzzy msgid "" "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines." -msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。" +msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113 @@ -11414,15 +11410,5 @@ "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " "keyboard...

" -msgstr "" -"

次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリスト" -"しており、あなたのキーボード上にあるキーではないことにご注意ください。あなた" -"のキーボード上にある実際のキーに対応する値だけを使用してください。もしあなた" -"のキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、Sun のキー" -"ボードにはあります)、使用しないでください。 また、あなたのキーボード上の" -"ショーツカットに対応するリストされた'key' もあります。(例： ':'/Colon)。これ" -"も同様に使わないでください。代わりにベースキー(US キーボードの';'/" -"Semicolon 、ドイツキーボードの '.'/Period 、...) を使ってください。そうしない" -"と競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and Ctrl+: がUS キー" -"ボードでは実際には同じことだと知る手立てが無いのです...

" +msgstr "

次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリストしており、あなたのキーボード上にあるキーではないことにご注意ください。あなたのキーボード上にある実際のキーに対応する値だけを使用してください。もしあなたのキーボードに ''Copy'' キーが無い場合 (PC キーボードにはありません、Sun のキーボードにはあります)、使用しないでください。 また、あなたのキーボード上のショーツカットに対応するリストされた''key'' もあります。(例： '':''/Colon)。これも同様に使わないでください。代わりにベースキー(US キーボードの'';''/Semicolon 、ドイツキーボードの ''.''/Period 、...) を使ってください。そうしないと競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and Ctrl+: がUS キーボードでは実際には同じことだと知る手立てが無いのです...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177 @@ -11453,7 +11439,5 @@ "

The pseudo-modifier ''disabled'' will disable the shortcut when " "encountered.

" -msgstr "" -"

擬似変更 'disabled' は、次に起こったときにショートカットを無効にします。" +msgstr "

擬似変更 ''disabled'' は、次に起こったときにショートカットを無効にします。

" #. scroll up @@ -11908,5 +11892,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11920,5 +11904,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11929,5 +11913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13639,6 +13623,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." @@ -17533,9 +17517,5 @@ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but " "true :-)" -msgstr "" -"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい" -"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の" -"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと 'Map " -"Settings' を参照してください(奇妙ですが本当です :-)" +msgstr "ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しいスキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map Settings'' を参照してください(奇妙ですが本当です :-)" #. Plugin Create_grid_of_ways @@ -17601,8 +17581,5 @@ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches " "the filename of an image." -msgstr "" -"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ" -"イントタグの 'name', 'cmt' または 'desc' 属性が画像のファイル名と一致したとき" -"に行われます。" +msgstr "画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポイントタグの ''name'', ''cmt'' または ''desc'' 属性が画像のファイル名と一致したときに行われます。" #. Plugin lakewalker Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 19552) +++ applications/editors/josm/i18n/po/nb.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 11:12-0500\n" "Last-Translator: Tor Christian Tovslid \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3815,10 +3815,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Tilkobling mislykkes" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Tilkobling mislykkes" @@ -3855,38 +3856,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Last opp innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Last opp aktive innstillinger til tjener" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "streng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Brukernavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Passord hos OSM." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Endre vinduets størrelse til oppgitt geometri (format: BREDDExHØYDE)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "string;string;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3896,5 +3897,5 @@ "lat=y&lon=x&zoom=z, eller filnavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3904,5 +3905,5 @@ "lat=y&lon=x&zoom=z, eller filnavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3912,18 +3913,18 @@ "som returnerer osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "enhver" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Brukernavn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4041,9 +4042,9 @@ msgstr "Bygger opp hovedskjermbilde" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10049,6 +10050,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Opphavsmann" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10086,5 +10089,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." msgstr "" @@ -10138,9 +10141,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Opphavsmann" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10151,5 +10156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10183,5 +10188,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10190,5 +10195,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10196,6 +10201,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Tilkobling mislykkes" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10204,5 +10210,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10219,5 +10225,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10246,5 +10252,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10275,6 +10281,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Velg minst fire noder." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10284,6 +10292,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Steng dialog og avbryt nedlasting" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10319,10 +10329,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10338,5 +10348,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10433,5 +10443,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10444,9 +10454,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10465,5 +10475,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10514,5 +10524,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11746,5 +11756,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11758,5 +11768,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11767,5 +11777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13448,6 +13458,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/nl.po =================================================================== --- applications/editors/josm/i18n/po/nl.po (revision 19552) +++ applications/editors/josm/i18n/po/nl.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 11:19-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ongeldige bestands-URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Waarschuwing" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3879,10 +3879,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Verbinding is mislukt." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Verbinding is mislukt." @@ -3919,38 +3920,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Voorkeuren uploaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "De huidige voorkeuren naar de server uploaden" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "string" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Naam van gebruiker." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM-wachtwoord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "De applet op de gegeven afmetingen instellen (BREEDTExHOOGTE)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "string;string;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3960,5 +3961,5 @@ "lat=y&lon=x&zoom=z of een bestandsnaam" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3968,5 +3969,5 @@ "lat=y&lon=x&zoom=z of een bestandsnaam" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3976,9 +3977,9 @@ "achtige zoekstring of een URL die een OSM-XML terugkrijgt" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "iedere" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" @@ -3986,10 +3987,10 @@ "plaats van gelezen." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Gebruikersnaam" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4107,9 +4108,9 @@ msgstr "Hoofdscherm aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10099,6 +10100,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Auteur" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10136,5 +10139,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." msgstr "" @@ -10188,9 +10191,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Auteur" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10201,5 +10206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10233,5 +10238,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10240,5 +10245,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10246,6 +10251,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Verbinding is mislukt." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10254,5 +10260,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10269,5 +10275,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10296,5 +10302,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10325,6 +10331,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Selecteer minstens vier knopen." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10334,6 +10342,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Sluit dialoog en stop het downloaden" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10369,10 +10379,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10388,5 +10398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10483,5 +10493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10494,9 +10504,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10515,5 +10525,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10564,5 +10574,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11813,5 +11823,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11825,5 +11835,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11834,5 +11844,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13503,6 +13513,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/pl.po =================================================================== --- applications/editors/josm/i18n/po/pl.po (revision 19552) +++ applications/editors/josm/i18n/po/pl.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 11:24-0500\n" "Last-Translator: Yarl \n" @@ -24,5 +24,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -35,12 +35,12 @@ msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Pominięto niepoprawny URL do pliku: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -96,9 +96,9 @@ msgstr "Uwaga" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3828,10 +3828,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Połączenie nie powiodło się." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Połączenie nie powiodło się." @@ -3868,38 +3869,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Wyślij Ustawienia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Wyślij bieżące ustawienia na serwer" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "tekst" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Nazwa użytkownika." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Hasło OSM." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "tekst;tekst;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3907,5 +3908,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3913,5 +3914,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3919,18 +3920,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "dowolne" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nazwa użytkownika" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4048,9 +4049,9 @@ msgstr "Przygotowywanie interfejsu użytkownika" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Ładowanie wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10013,6 +10014,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10050,5 +10053,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." msgstr "" @@ -10102,9 +10105,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10115,5 +10120,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10147,5 +10152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10154,5 +10159,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10160,6 +10165,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Połączenie nie powiodło się." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10168,5 +10174,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10183,5 +10189,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10210,5 +10216,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10239,6 +10245,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Wybierz co najmniej cztery węzły." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10248,6 +10256,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Zamknij okno i porzuć pobieranie" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10283,10 +10293,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10302,5 +10312,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10397,5 +10407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10408,9 +10418,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10429,5 +10439,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10478,5 +10488,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11677,5 +11687,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11689,5 +11699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11698,5 +11708,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13372,6 +13382,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- applications/editors/josm/i18n/po/pt_BR.po (revision 19552) +++ applications/editors/josm/i18n/po/pt_BR.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 13:03-0500\n" "Last-Translator: vitor \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Ajuda" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando arquivo malformado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,10 +92,10 @@ msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Parâmetros \"downloadgps\" não aceita nome de arquivos ou URLs de arquivos." -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3909,10 +3909,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Falha na conexão." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Falha na conexão." @@ -3949,38 +3950,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Enviar Preferências" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Enviar as preferências atuais para o servidor" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "sequência de texto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Nome do usuário" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Senha do OSM" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Redimensionar applet para geometria dada (formato: LARGURA x ALTURA)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "string;string;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3990,5 +3991,5 @@ "um arquivo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3998,5 +3999,5 @@ "lat=y&lon=x&zoom=z ou um nome de arquivo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4006,18 +4007,18 @@ "Google ou uma URL que retorne um osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "qualquer" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Se especificado, resetar configuração ao invés de carregá-la." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nome do Usuário" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4135,9 +4136,9 @@ msgstr "Criando tela principal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Carregando plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10158,6 +10159,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10195,5 +10198,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." msgstr "" @@ -10247,9 +10250,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10260,5 +10265,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10292,5 +10297,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10299,5 +10304,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10305,6 +10310,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Falha na conexão." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10313,5 +10319,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10328,5 +10334,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10355,5 +10361,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10384,6 +10390,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Por favor, selecione no mínimo 4 nós." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10393,6 +10401,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Feche a mensagem e cancele a transferência" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10428,10 +10438,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10447,5 +10457,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10542,5 +10552,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10553,9 +10563,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10574,5 +10584,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10623,5 +10633,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11822,5 +11832,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11834,5 +11844,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11843,5 +11853,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13512,6 +13522,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/ro.po =================================================================== --- applications/editors/josm/i18n/po/ro.po (revision 19552) +++ applications/editors/josm/i18n/po/ro.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-13 10:57+0000\n" "Last-Translator: Adi Roiban \n" @@ -24,5 +24,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -35,12 +35,12 @@ msgstr "_Ajutor" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Se ingoră fişierul URL prost format: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -96,9 +96,9 @@ msgstr "Avertisment" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3776,9 +3776,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "" @@ -3815,38 +3815,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "şir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Numele utilizatorului." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Parola OSM." +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "şir;şir;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3854,5 +3854,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3860,5 +3860,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3866,18 +3866,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "oricare" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Dacă este specificat, resetează configuraţia în loc de a o citi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Nume utilizator" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -3995,9 +3995,9 @@ msgstr "Se creează interfața grafică" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -9940,5 +9940,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" +msgid "Authorize URL:" msgstr "" @@ -9977,5 +9977,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." msgstr "" @@ -10029,9 +10029,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" +msgid "Authorize now" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10042,5 +10042,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10074,5 +10074,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10081,5 +10081,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10087,5 +10087,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "" @@ -10095,5 +10095,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10110,5 +10110,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10137,5 +10137,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10166,6 +10166,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Vă rog selectaţi cel puţin patru noduri." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10175,5 +10177,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "" @@ -10210,10 +10212,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10229,5 +10231,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10324,5 +10326,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10335,9 +10337,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10356,5 +10358,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10405,5 +10407,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11594,5 +11596,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11606,5 +11608,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11615,5 +11617,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13272,6 +13274,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 19552) +++ applications/editors/josm/i18n/po/ru.po (revision 19557) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" -"PO-Revision-Date: 2010-01-18 13:20-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" +"PO-Revision-Date: 2010-01-18 23:59-0500\n" "Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" @@ -23,5 +23,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -34,12 +34,12 @@ msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнорирование неправильной ссылки на файл: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -95,10 +95,10 @@ msgstr "Предупреждение" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Параметр \"скачать gps\" не принимает имена файлов или файлов URL-адресов" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -4004,10 +4004,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" +#| msgid "Authorisation Failed" +msgid "Authorization Failed" msgstr "Авторизация не удалась" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Аутентификация не удалась" @@ -4044,38 +4045,38 @@ msgstr "Ожидалось непустое значение для параметра ''{0}'', получено ''{1}''" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Загрузить параметры" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Загрузить текущие параметры на сервер" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "строка" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Имя пользователя" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Пароль OSM" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Изменить размер апплета на заданный (формат: ШИРИНАxВЫСОТА)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "строка;строка;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4085,5 +4086,5 @@ "lat=y&lon=x&zoom=z, либо название файла" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4093,5 +4094,5 @@ "URL, содержащая lat=y&lon=x&zoom=z, либо название файла" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4101,18 +4102,18 @@ "ссылкой, которая возвращает osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "любое" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Если выбрано - установить настройки по умолчанию." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Имя пользователя" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4241,9 +4242,9 @@ msgstr "Создание интерфейса" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Загрузка модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10607,5 +10608,6 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" +#| msgid "Authorise URL:" +msgid "Authorize URL:" msgstr "URL авторизации:" @@ -10646,5 +10648,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." msgstr "" @@ -10700,9 +10702,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" +#| msgid "Authorise now" +msgid "Authorize now" msgstr "Авторизоваться" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10713,5 +10716,6 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +#| msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "Запустить процедуру автоматической авторизации ещё раз" @@ -10747,12 +10751,17 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456 +#| msgid "" +#| "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." msgid "" "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" "Автоматический процесс получения маркера доступа OAuth
с сервера " @@ -10764,5 +10773,6 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" +#| msgid "OAuth authorisation failed" +msgid "OAuth authorization failed" msgstr "Авторизация OAuth не удалась" @@ -10772,5 +10782,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10794,6 +10804,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58 #, java-format -msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +#| msgid "" +#| "Please enter an OAuth Access Token which is authorised to access the OSM " +#| "server ''{0}''." +msgid "" +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10823,6 +10836,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139 #, java-format -msgid "" -"Please enter an OAuth Access Token which is authorised to access " +#| msgid "" +#| "Please enter an OAuth Access Token which is authorised to " +#| "access the OSM server ''{0}''." +msgid "" +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10859,5 +10875,6 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " +#| msgid "Please select an authorisation procedure: " +msgid "Please select an authorization procedure: " msgstr "Пожалуйста выбирите способ авторизации: " @@ -10868,5 +10885,6 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +#| msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "Закрыть диалог и отменить авторизацию" @@ -10905,11 +10923,13 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +#| msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "Не удалось выполнить запрос OAuth-авторизации ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 -#, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." -msgstr "" +#, fuzzy, java-format +#| msgid "Retrieving OAuth Request Token from ''{0}''" +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." +msgstr "Восстановление маркера запроса OAuth от ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486 @@ -10923,7 +10943,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 -#, java-format -msgid "Authorising request token ''{0}''..." -msgstr "" +#, fuzzy, java-format +#| msgid "Retrieving OAuth Request Token from ''{0}''" +msgid "Authorizing request token ''{0}''..." +msgstr "Восстановление маркера запроса OAuth от ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 @@ -11019,5 +11040,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -11030,9 +11051,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -11051,5 +11072,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -11100,5 +11121,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -12366,5 +12387,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -12378,5 +12399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -12387,5 +12408,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -14147,6 +14168,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/sk.po =================================================================== --- applications/editors/josm/i18n/po/sk.po (revision 19552) +++ applications/editors/josm/i18n/po/sk.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 13:29-0500\n" "Last-Translator: Vlado \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Nápoveda" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorujem poškodený súbor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Upozornenie" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" neakceptuje názov súboru, alebo URL súboru" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3951,10 +3951,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Spojenie zlyhalo." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Spojenie zlyhalo." @@ -3991,38 +3992,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Nahrať nastavenie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Nahrať súčasné nastavenie na server" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "reťazec" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Meno užívateľa." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM heslo." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Zmeniť veľkosť appletu (formát: ŠÍRKAxVÝŠKA)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "reťazec;reťazec;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -4032,5 +4033,5 @@ "šírka=y&dĺžka=x&zoom=z alebo ešte názov súboru" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -4040,5 +4041,5 @@ "obsahujúcom šírka=y&dĺžka=x&zoom=z alebo ešte ešte názov súboru" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -4048,19 +4049,19 @@ "google, alebo URL vracajúci sa z osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "akýkoľvek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" "Ak je špecifikovaný(určený), reset konfigurácie namiesto jej načítania." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Meno používateľa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4178,9 +4179,9 @@ msgstr "Vytváram hlavné grafické rozhranie ( GUI )" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Načítavam pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10377,6 +10378,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10414,5 +10417,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." msgstr "" @@ -10466,9 +10469,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Autor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10479,5 +10484,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10511,5 +10516,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10518,5 +10523,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10524,6 +10529,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Spojenie zlyhalo." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10532,5 +10538,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10547,5 +10553,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10574,5 +10580,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10603,6 +10609,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Vyberte minimálne 4 body" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10612,6 +10620,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Zavrieť dialóg a zrušiť sťahovanie" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10647,10 +10657,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10665,7 +10675,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 -#, java-format -msgid "Authorising request token ''{0}''..." -msgstr "" +#, fuzzy, java-format +#| msgid "Missing required attribute ''{0}''." +msgid "Authorizing request token ''{0}''..." +msgstr "Chýba povinná vlastnosť ''{0}''." #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504 @@ -10761,5 +10772,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10772,9 +10783,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10793,5 +10804,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10842,5 +10853,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -12084,5 +12095,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -12096,5 +12107,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -12105,5 +12116,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13832,6 +13843,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 19552) +++ applications/editors/josm/i18n/po/sl.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 13:32-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -21,5 +21,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -32,12 +32,12 @@ msgstr "Pomoč" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -93,9 +93,9 @@ msgstr "Pozor" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3796,10 +3796,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Povezava ni uspela." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Povezava ni uspela." @@ -3836,38 +3837,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Pošiljanje nastavitev" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Prenos trenutnih nastavitev na strežnik" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Ime uporabnika." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "Geslo za dostop do OSM" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 -msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3875,5 +3876,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3881,5 +3882,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3887,18 +3888,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "katerikoli" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Uporabniško ime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4016,9 +4017,9 @@ msgstr "Priprava grafičnega uporabniškega vmesnika" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Nalaganje vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -9979,6 +9980,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Avtor" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10016,5 +10019,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." msgstr "" @@ -10068,9 +10071,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Avtor" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10081,5 +10086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10113,5 +10118,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10120,5 +10125,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10126,6 +10131,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Povezava ni uspela." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10134,5 +10140,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10149,5 +10155,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10176,5 +10182,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10205,6 +10211,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Prosim, izberite vsaj 4 vozlišča." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10214,5 +10222,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" +msgid "Close the dialog and cancel authorization" msgstr "" @@ -10249,10 +10257,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10268,5 +10276,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10363,5 +10371,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10374,9 +10382,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10395,5 +10403,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10444,5 +10452,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11634,5 +11642,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11646,5 +11654,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11655,5 +11663,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13332,6 +13340,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 19552) +++ applications/editors/josm/i18n/po/sv.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 13:37-0500\n" "Last-Translator: Andreas Vilén \n" @@ -20,5 +20,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Hoppar över felaktig URL till en fil: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -92,9 +92,9 @@ msgstr "Varning" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3853,10 +3853,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Anslutning misslyckades." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Anslutning misslyckades." @@ -3893,38 +3894,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Skicka in inställningar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Skicka in inställningar till servern" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "sträng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Användarnamn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM-lösenord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3934,5 +3935,5 @@ "lat=y&lon=x&zoom=z eller ett filnamn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3942,5 +3943,5 @@ "lat=y&lon=x&zoom=z eller ett filnamn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3950,18 +3951,18 @@ "eller en URL som returnerar osm-xml" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "valfri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Om angivet så återställ konfigurationen istället för att läsa in den." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "Användarnamn" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4079,9 +4080,9 @@ msgstr "Skapar huvudgränssnittet" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -10048,6 +10049,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "Upphovsman" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10085,5 +10088,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." msgstr "" @@ -10137,9 +10140,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "Upphovsman" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10150,5 +10155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10182,5 +10187,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10189,5 +10194,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10195,6 +10200,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Anslutning misslyckades." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10203,5 +10209,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10218,5 +10224,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10245,5 +10251,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10274,6 +10280,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "Välj åtminstone fyra noder." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10283,6 +10291,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Stäng dialogen och avbryt hämtning" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10318,10 +10328,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10337,5 +10347,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10432,5 +10442,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10443,9 +10453,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10464,5 +10474,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10513,5 +10523,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11758,5 +11768,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11770,5 +11780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11779,5 +11789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13456,6 +13466,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/tr.po =================================================================== --- applications/editors/josm/i18n/po/tr.po (revision 19552) +++ applications/editors/josm/i18n/po/tr.po (revision 19557) @@ -10,5 +10,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 13:41-0500\n" "Last-Translator: Dirk Stöcker \n" @@ -22,5 +22,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -33,12 +33,12 @@ msgstr "Yardım" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "hatalı dosya atlandı URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -94,9 +94,9 @@ msgstr "Uyarı" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3778,10 +3778,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "Bağlantı hatası." #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "Bağlantı hatası." @@ -3818,28 +3819,28 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "Tercihleri yükleyiniz" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "Tercihleri server'a yükleyiniz" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "metin" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "Kullanıcının Adı." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM Şifresi." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "" @@ -3847,11 +3848,11 @@ "GENIŞLIKxYUKSEKLIK)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "metin;metin;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3860,5 +3861,5 @@ "Hepsini indir x1,y1,x2,y2 içeren linkler lat=y&lon=x&zoom=z veya dosyaadı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3868,5 +3869,5 @@ "veya dosyaadı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3876,18 +3877,18 @@ "bir link olabilir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "herhangi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "Belirlenmişse, konfigürsayonu sıfırla." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "KullanıcıAdı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4005,9 +4006,9 @@ msgstr "Arayüz Oluşturuluyor." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "Eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -9927,6 +9928,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "yazar" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -9964,5 +9967,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." msgstr "" @@ -10016,9 +10019,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "yazar" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10029,5 +10034,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10061,5 +10066,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10068,5 +10073,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10074,6 +10079,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "Bağlantı hatası." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10082,5 +10088,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10097,5 +10103,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10124,5 +10130,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10153,6 +10159,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "En azından dört nokta seç." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10162,6 +10170,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "Pencereyi kapat ve indirmeyi iptal et" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10197,10 +10207,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10216,5 +10226,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10311,5 +10321,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10322,9 +10332,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10343,5 +10353,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10392,5 +10402,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11603,5 +11613,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11615,5 +11625,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11624,5 +11634,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13286,6 +13296,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token." Index: applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- applications/editors/josm/i18n/po/zh_TW.po (revision 19552) +++ applications/editors/josm/i18n/po/zh_TW.po (revision 19557) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-18 14:23-0500\n" +"POT-Creation-Date: 2010-01-18 23:20-0500\n" "PO-Revision-Date: 2010-01-18 13:47-0500\n" "Last-Translator: Chao-Hsiung Liao \n" @@ -21,5 +21,5 @@ #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:200 +#: ../core/src/org/openstreetmap/josm/Main.java:204 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -32,12 +32,12 @@ msgstr "說明" -#: ../core/src/org/openstreetmap/josm/Main.java:378 +#: ../core/src/org/openstreetmap/josm/Main.java:396 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "忽略格式不良的檔案 URL： \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:379 -#: ../core/src/org/openstreetmap/josm/Main.java:412 -#: ../core/src/org/openstreetmap/josm/Main.java:480 +#: ../core/src/org/openstreetmap/josm/Main.java:397 +#: ../core/src/org/openstreetmap/josm/Main.java:430 +#: ../core/src/org/openstreetmap/josm/Main.java:498 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -93,9 +93,9 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:411 +#: ../core/src/org/openstreetmap/josm/Main.java:429 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:479 +#: ../core/src/org/openstreetmap/josm/Main.java:497 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -3784,10 +3784,11 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 -msgid "Authorisation Failed" -msgstr "" +#, fuzzy +msgid "Authorization Failed" +msgstr "驗證" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 #, fuzzy -msgid "Authenticationi failed" +msgid "Authentication failed" msgstr "驗證" @@ -3824,38 +3825,38 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "Upload Preferences" msgstr "上傳偏好設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "Upload the current preferences to the server" msgstr "將目前的偏好設定上傳到伺服器" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "string" msgstr "字串" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54 msgid "Name of the user." msgstr "使用者的名稱。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55 msgid "OSM Password." msgstr "OSM 密碼。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "將小程式重設為指定的大小（格式：寬x高）" +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "string;string;..." msgstr "字串;字串;..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57 msgid "" "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a " @@ -3864,5 +3865,5 @@ "下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing " @@ -3872,5 +3873,5 @@ "案名稱" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -3879,18 +3880,18 @@ "加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "any" msgstr "任何" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 msgid "If specified, reset the configuration instead of reading it." msgstr "如果指定，會重設組態而非讀取它。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" msgstr "使用者名稱" -#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" @@ -4008,9 +4009,9 @@ msgstr "建立主視窗中" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 msgid "Loading plugins" msgstr "正在載入外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:229 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:237 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -9974,6 +9975,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 -msgid "Authorise URL:" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize URL:" +msgstr "作者" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -10011,5 +10014,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." msgstr "" @@ -10063,9 +10066,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305 -msgid "Authorise now" -msgstr "" +#, fuzzy +#| msgid "Author" +msgid "Authorize now" +msgstr "作者" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335 -msgid "Click to redirect you to the authorisation form on the JOSM web site" +msgid "Click to redirect you to the authorization form on the JOSM web site" msgstr "" @@ -10076,5 +10081,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366 -msgid "Run the automatic authorisation steps again" +msgid "Run the automatic authorization steps again" msgstr "" @@ -10108,5 +10113,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442 -msgid "Authorise JOSM to access the OSM API" +msgid "Authorize JOSM to access the OSM API" msgstr "" @@ -10115,5 +10120,5 @@ "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." +"authorization process,
i.e. semi-automatic or manual authorization." msgstr "" @@ -10121,6 +10126,7 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505 -msgid "OAuth authorisation failed" -msgstr "" +#, fuzzy +msgid "OAuth authorization failed" +msgstr "驗證" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472 @@ -10129,5 +10135,5 @@ "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}''.

Please check your " +"from the OAuth Authorize Endpoint URL ''{0}''.

Please check your " "advanced setting and try again." msgstr "" @@ -10144,5 +10150,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access the OSM " +"Please enter an OAuth Access Token which is authorized to access the OSM " "server ''{0}''." msgstr "" @@ -10171,5 +10177,5 @@ #, java-format msgid "" -"Please enter an OAuth Access Token which is authorised to access " +"Please enter an OAuth Access Token which is authorized to access " "the OSM server ''{0}''." msgstr "" @@ -10200,6 +10206,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121 -msgid "Please select an authorisation procedure: " -msgstr "" +#, fuzzy +#| msgid "Please select at least four nodes." +msgid "Please select an authorization procedure: " +msgstr "請選取至少四個節點" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239 @@ -10209,6 +10217,8 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340 -msgid "Close the dialog and cancel authorisation" -msgstr "" +#, fuzzy +#| msgid "Close dialog and cancel downloading" +msgid "Close the dialog and cancel authorization" +msgstr "關閉對話盒並取消下載" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359 @@ -10244,10 +10254,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437 #, java-format -msgid "Failed to authorise OAuth request ''{0}''" +msgid "Failed to authorize OAuth request ''{0}''" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484 #, java-format -msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..." +msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..." msgstr "" @@ -10263,5 +10273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498 #, java-format -msgid "Authorising request token ''{0}''..." +msgid "Authorizing request token ''{0}''..." msgstr "" @@ -10358,5 +10368,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205 -msgid "Step 2/3: Authorise and retrieve an Access Token" +msgid "Step 2/3: Authorize and retrieve an Access Token" msgstr "" @@ -10369,9 +10379,9 @@ msgid "" "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 " +"authorization page in an external browser. Please login with your OSM " +"username and password and follow the instructions 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 and paste it into the address field of your browser." +"following authorize URL and paste it into the address field of your browser." "" msgstr "" @@ -10390,5 +10400,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.

The access token is: " +"authorization to the OSM server.

The access token is: " msgstr "" @@ -10439,5 +10449,5 @@ msgid "" "Failed to access the OSM server ''{0}''
with the Access Token " -"''{0}''.
The server rejected the Access Token as unauthorised. You will " +"''{0}''.
The server rejected the Access Token as unauthorized. You will " "not
be able to access any protected resource on this server using this " "token." @@ -11635,5 +11645,5 @@ msgid "" "You do not have an Access Token yet to access the OSM server using OAuth. " -"Please authorise first." +"Please authorize first." msgstr "" @@ -11647,5 +11657,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306 -msgid "Click to step through the OAuth authorisation process" +msgid "Click to step through the OAuth authorization process" msgstr "" @@ -11656,5 +11666,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 msgid "" -"Click to step through the OAuth authorisation process and generate a new " +"Click to step through the OAuth authorization process and generate a new " "Access Token" msgstr "" @@ -13313,6 +13323,6 @@ #, java-format msgid "" -"Authorisation at the OSM server with the OAuth token ''{0}'' failed." -"
The token is not authorised to access the protected resource
''{1}''." +"Authorization at the OSM server with the OAuth token ''{0}'' failed." +"
The token is not authorized to access the protected resource
''{1}''." "
Please launch the preferences dialog and retrieve another OAuth token."