From 80f5ab4cc2439670e3173990bb0392b98fd16c81 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 24 Jun 2013 16:33:37 +0000 Subject: - langpacks/english: updated git-svn-id: http://svn.miranda-ng.org/main/trunk@5125 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Langpack_english.txt | 43 +++++++++++++++++----------------- langpacks/english/Plugins/Skype.txt | 41 +++++++++++++++++--------------- langpacks/english/Plugins/TabSRMM.txt | 2 -- 3 files changed, 44 insertions(+), 42 deletions(-) (limited to 'langpacks/english') diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt index 1278fbb30d..f1f42becaf 100644 --- a/langpacks/english/Langpack_english.txt +++ b/langpacks/english/Langpack_english.txt @@ -15247,45 +15247,47 @@ [for incoming connections] [Use ports 80 and 443 as alternative incoming] [Default group:] -[Skype bookmarks] -[Server side bookmarks\nControl conference bookmarks on server.] +[Ignore list] +[Server side ignore list\nControl ignore list on server.] ;file \protocols\Skype\src\skype.cpp [Did not unpack SkypeKit.exe.] ;file \protocols\Skype\src\skype_account.cpp [LOGOUT_CALLED] -[HTTPS_PROXY_AUTH_FAILED] -[SOCKS_PROXY_AUTH_FAILED] -[P2P_CONNECT_FAILED] +[HTTPS proxy authentication failed] +[SOCKS proxy authentication failed] +[P2P connection failed] [SERVER_CONNECT_FAILED] -[SERVER_OVERLOADED] -[DB_IN_USE] +[Server is overloaded] +[SkypeKit database already in use] [Invalid skypename] [Invalid email] [Unacceptable password] -[SKYPENAME_TAKEN] +[Skype name is taken] [REJECTED_AS_UNDERAGE] [NO_SUCH_IDENTITY] [Incorrect password] [Too many login attempts] -[PASSWORD_HAS_CHANGED] +[Password has changed] [PERIODIC_UIC_UPDATE_FAILED] [DB_DISK_FULL] [DB_IO_ERROR] -[DB_CORRUPT] +[SkypeKit database is corrupt] [DB_FAILURE] -[INVALID_APP_ID] +[Invalid application ID] [APP_ID_FAILURE] -[UNSUPPORTED_VERSION] -[ATO (Account TakeOver) detected, account blocked] +[Version is unsupported] +[Account blocked] [Logout from another instance] -[Password change succeeded] +[ACCESS_TOKEN_RENEWAL_FAILED] +[Password successfully changed] +[Password changing] [Old password was incorrect] [Failed to verify password. No connection to server] [Password was set but server didn't like it much] [New password was exactly the same as old one] [The new password was unacceptable] [Account was currently not logged in] -[You have not entered a Skype name.\nConfigure this in Options->Network->Skype and try again.] +[You have not entered a Skype name.\nConfigure this in Options->Network->%s and try again.] ;file \protocols\Skype\src\skype_bookmarks.cpp [Name] [Conferences] @@ -15326,7 +15328,6 @@ [You are not currently connected to the Skype network. You must be online in order to update your information on the server.] ;file \protocols\Skype\src\skype_events.cpp [Spawn conference] -[Bookmark] [Network] [Contacts] [Home] @@ -15334,11 +15335,14 @@ ;file \protocols\Skype\src\skype_icons.cpp [Protocol icon] [Call] +[Conference] [Send contact] +[Contact] [Delete] [Ignore] [Block] [Protocols] +;file \protocols\Skype\src\skype_ignore_list.cpp ;file \protocols\Skype\src\skype_instances.cpp [SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.] [Initialization key corrupted or not valid.] @@ -15348,8 +15352,6 @@ [Request authorization] [Grant authorization] [Revoke authorization] -[Set bookmark] -[Bookmarks] ;file \protocols\Skype\src\skype_messages.cpp [Incoming call received] [Incoming call from %s. Use offical skype for calling.] @@ -15357,7 +15359,7 @@ ;file \protocols\Skype\src\skype_netlib.cpp [%s connection] ;file \protocols\Skype\src\skype_proto.cpp -[Skype Name] +[Skype name] ;file \protocols\Skype\src\skype_utils.cpp [NOT_VALIDATED] [Validation succeeded] @@ -15371,6 +15373,7 @@ [Password is too simple] [Value starts with an invalid character] [Avatars] +[Command"%s" is unsupported] #muuid {2925520b-6677-4658-8bad-5661d13e4692} ;============================================================ ; File: SkypeStatusChange.dll @@ -16988,10 +16991,8 @@ [Automatically copy selected text] [Message log appearance] [Support for external plugins] -[Additional events to show] [Timestamp settings (note: timstamps also depend on your templates)] [Message log icons] -[Show file events] [Show dates in timestamps] [Show seconds in timestamps] [Use contacts local time (if timezone info available)] diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt index d73c0e197e..d0973a287b 100644 --- a/langpacks/english/Plugins/Skype.txt +++ b/langpacks/english/Plugins/Skype.txt @@ -64,45 +64,47 @@ [for incoming connections] [Use ports 80 and 443 as alternative incoming] [Default group:] -[Skype bookmarks] -[Server side bookmarks\nControl conference bookmarks on server.] +[Ignore list] +[Server side ignore list\nControl ignore list on server.] ;file \protocols\Skype\src\skype.cpp [Did not unpack SkypeKit.exe.] ;file \protocols\Skype\src\skype_account.cpp [LOGOUT_CALLED] -[HTTPS_PROXY_AUTH_FAILED] -[SOCKS_PROXY_AUTH_FAILED] -[P2P_CONNECT_FAILED] +[HTTPS proxy authentication failed] +[SOCKS proxy authentication failed] +[P2P connection failed] [SERVER_CONNECT_FAILED] -[SERVER_OVERLOADED] -[DB_IN_USE] +[Server is overloaded] +[SkypeKit database already in use] [Invalid skypename] [Invalid email] [Unacceptable password] -[SKYPENAME_TAKEN] +[Skype name is taken] [REJECTED_AS_UNDERAGE] [NO_SUCH_IDENTITY] [Incorrect password] [Too many login attempts] -[PASSWORD_HAS_CHANGED] +[Password has changed] [PERIODIC_UIC_UPDATE_FAILED] [DB_DISK_FULL] [DB_IO_ERROR] -[DB_CORRUPT] +[SkypeKit database is corrupt] [DB_FAILURE] -[INVALID_APP_ID] +[Invalid application ID] [APP_ID_FAILURE] -[UNSUPPORTED_VERSION] -[ATO (Account TakeOver) detected, account blocked] +[Version is unsupported] +[Account blocked] [Logout from another instance] -[Password change succeeded] +[ACCESS_TOKEN_RENEWAL_FAILED] +[Password successfully changed] +[Password changing] [Old password was incorrect] [Failed to verify password. No connection to server] [Password was set but server didn't like it much] [New password was exactly the same as old one] [The new password was unacceptable] [Account was currently not logged in] -[You have not entered a Skype name.\nConfigure this in Options->Network->Skype and try again.] +[You have not entered a Skype name.\nConfigure this in Options->Network->%s and try again.] ;file \protocols\Skype\src\skype_bookmarks.cpp [Name] [Conferences] @@ -143,7 +145,6 @@ [You are not currently connected to the Skype network. You must be online in order to update your information on the server.] ;file \protocols\Skype\src\skype_events.cpp [Spawn conference] -[Bookmark] [Network] [Contacts] [Home] @@ -151,11 +152,14 @@ ;file \protocols\Skype\src\skype_icons.cpp [Protocol icon] [Call] +[Conference] [Send contact] +[Contact] [Delete] [Ignore] [Block] [Protocols] +;file \protocols\Skype\src\skype_ignore_list.cpp ;file \protocols\Skype\src\skype_instances.cpp [SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.] [Initialization key corrupted or not valid.] @@ -165,8 +169,6 @@ [Request authorization] [Grant authorization] [Revoke authorization] -[Set bookmark] -[Bookmarks] ;file \protocols\Skype\src\skype_messages.cpp [Incoming call received] [Incoming call from %s. Use offical skype for calling.] @@ -174,7 +176,7 @@ ;file \protocols\Skype\src\skype_netlib.cpp [%s connection] ;file \protocols\Skype\src\skype_proto.cpp -[Skype Name] +[Skype name] ;file \protocols\Skype\src\skype_utils.cpp [NOT_VALIDATED] [Validation succeeded] @@ -188,3 +190,4 @@ [Password is too simple] [Value starts with an invalid character] [Avatars] +[Command"%s" is unsupported] diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 1e4c819de9..28c16114de 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -892,10 +892,8 @@ [Automatically copy selected text] [Message log appearance] [Support for external plugins] -[Additional events to show] [Timestamp settings (note: timstamps also depend on your templates)] [Message log icons] -[Show file events] [Show dates in timestamps] [Show seconds in timestamps] [Use contacts local time (if timezone info available)] -- cgit v1.2.3