- Skype: translation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@5224 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 24 insertions, 16 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 1c9df79ad2..a08fc8f7db 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -15236,7 +15236,6 @@
 [Block]

 [Block this person]

 [%s]

-[Are you sure you want to block %s?\nThey won't be able to contact you\nand won't appear in your Contact List.]

 [Remove from your Contact List]

 [Abuse]

 [You can also report abuse from this user.]

@@ -15281,6 +15280,7 @@
 [Account was currently not logged in]

 [You have not entered a Skype name.\nConfigure this in Options->Network->%s and try again.]

 ;file \protocols\Skype\src\skype_blocked.cpp

+[Are you sure you want to block "%s" (%s)? They won't be able to contact you and won't appear in your Contact List.]

 [Name]

 ;file \protocols\Skype\src\skype_bookmarks.cpp

 [Conferences]

@@ -15342,18 +15342,22 @@
 [SkypeKit did not start.]

 ;file \protocols\Skype\src\skype_menus.cpp

 [Unblock this person...]

+[Block this person...]

 [Request authorization]

 [Grant authorization]

 [Revoke authorization]

-[Block this person...]

 [View old messages...]

-[...by last day]

-[...by last week]

-[...by last month]

-[...by last 3 month]

+[for last day]

+[for last week]

+[for last month]

+[for last 3 month]

+[for last year]

+[for all time]

 ;file \protocols\Skype\src\skype_messages.cpp

 [Incoming call started]

 [Incoming call finished]

+[history synchronization]

+[Done!]

 ;file \protocols\Skype\src\skype_netlib.cpp

 [%s connection]

 ;file \protocols\Skype\src\skype_proto.cpp

diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index 3d6a2425b2..e5bcb2c9b6 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -65,7 +65,6 @@
 [Block]

 [Block this person]

 [%s]

-[Are you sure you want to block %s?\nThey won't be able to contact you\nand won't appear in your Contact List.]

 [Remove from your Contact List]

 [Abuse]

 [You can also report abuse from this user.]

@@ -110,6 +109,7 @@
 [Account was currently not logged in]

 [You have not entered a Skype name.\nConfigure this in Options->Network->%s and try again.]

 ;file \protocols\Skype\src\skype_blocked.cpp

+[Are you sure you want to block "%s" (%s)? They won't be able to contact you and won't appear in your Contact List.]

 [Name]

 ;file \protocols\Skype\src\skype_bookmarks.cpp

 [Conferences]

@@ -171,18 +171,22 @@
 [SkypeKit did not start.]

 ;file \protocols\Skype\src\skype_menus.cpp

 [Unblock this person...]

+[Block this person...]

 [Request authorization]

 [Grant authorization]

 [Revoke authorization]

-[Block this person...]

 [View old messages...]

-[...by last day]

-[...by last week]

-[...by last month]

-[...by last 3 month]

+[for last day]

+[for last week]

+[for last month]

+[for last 3 month]

+[for last year]

+[for all time]

 ;file \protocols\Skype\src\skype_messages.cpp

 [Incoming call started]

 [Incoming call finished]

+[history synchronization]

+[Done!]

 ;file \protocols\Skype\src\skype_netlib.cpp

 [%s connection]

 ;file \protocols\Skype\src\skype_proto.cpp

diff --git a/langpacks/russian/Plugins/Skype.txt b/langpacks/russian/Plugins/Skype.txt
index ca9186cd8a..68aa7fd8d3 100644
--- a/langpacks/russian/Plugins/Skype.txt
+++ b/langpacks/russian/Plugins/Skype.txt
@@ -273,8 +273,8 @@ Skype протокол
 Вы также можете сообщить о нарущении правил этим пользователем.

 [Report abuse]

 Сообщить о нарушении

-[Are you sure you want to block %s?\nThey won't be able to contact you\nand won't appear in your Contact List.]

-Вы действительно хотите блокировать %s?\nБлокированные пользователи не смогут связаться с вами\nи не будут показываться в вашем списке контактов.

+[Are you sure you want to block "%s" (%s)? They won't be able to contact you and won't appear in your Contact List.]

+Вы действительно хотите блокировать "%s" (%s)? Блокированные пользователи не смогут связаться с вами и не будут показываться в вашем списке контактов.

 [View old messages...]

 Просмотреть историю...

 [...by last day]

diff --git a/protocols/Skype/src/skype_blocked.cpp b/protocols/Skype/src/skype_blocked.cpp
index e9d4461b59..c9e885008c 100644
--- a/protocols/Skype/src/skype_blocked.cpp
+++ b/protocols/Skype/src/skype_blocked.cpp
@@ -81,10 +81,10 @@ INT_PTR CALLBACK CSkypeProto::SkypeBlockProc(HWND hwndDlg, UINT msg, WPARAM wPar
 			::mir_sntprintf(

 				text, 

 				SIZEOF(text), 

-				TranslateT("Are you sure you want to block \"%s\" (%s)? They won't be able to contact you and won't appear in your Contact List."),

+				::TranslateT("Are you sure you want to block \"%s\" (%s)? They won't be able to contact you and won't appear in your Contact List."),

 				nick,

 				ptrW(::db_get_wsa(param->hContact, param->ppro->m_szModuleName, SKYPE_SETTINGS_SID)));

-			::SetDlgItemText(hwndDlg, IDC_MESSAGE, text), 

+			::SetDlgItemText(hwndDlg, IDC_MESSAGE, text);

 

 			::Utils_RestoreWindowPosition(hwndDlg, 0, MODULE, "BlockWindow");

 		}