- langpacks/english: updated

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

4 files changed, 100 insertions, 12 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 82b5d3c1de..204ca21281 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -5633,8 +5633,8 @@
 [Login error: Some Facebook things are required.]

 [Your account requires HTTPS connection. Activating.]

 [Login error: Captcha code is required. Bad login credentials?]

-[Unknown login error]

-[Login error: ]

+[Login error: %s]

+[Unknown error]

 [Login error, probably bad login credentials.]

 [Something happened to Facebook. Maybe there was some major update so you should wait for an update.]

 [Need confirmation for sending messages to other clients.\nOpen facebook website and try to send message to this contact again!]

@@ -5663,6 +5663,7 @@
 [Sample newsfeed]

 [Sample notification]

 ;file \protocols\FacebookRM\src\json.cpp

+[Message read: %s]

 [Multichat]

 ;file \protocols\FacebookRM\src\messages.cpp

 [You cannot send messages when you are offline.]

@@ -5685,16 +5686,18 @@
 [Loading newsfeeds...]

 [Checking friend requests...]

 [Refreshing buddy list...]

-[Do you want to cancel your friendship with '%s'?]

 ;file \protocols\FacebookRM\src\theme.cpp

-[Facebook Icon]

+[Facebook icon]

 [Mind]

+[Poke]

 [Cancel friendship]

 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

-[Visit Profile]

+[Visit profile]

+[Visit friendship details]

 [Mind...]

+[Visit Profile]

 [Services...]

 [Refresh Buddy List]

 [Services]

@@ -13051,11 +13054,12 @@
 ;file \plugins\ProfileManager\src\pmanagerEx.cpp

 [Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?]

 [Check Database]

-[Database]

 [Load profile]

 [Change profile]

 [Check database]

 [Restart]

+[Profile manager]

+[Database]

 #muuid {26a9125d-7863-4e01-af0e-d14ef95c5054}

 ;============================================================

 ;  File: PopUp.dll

@@ -19048,6 +19052,46 @@
 [Winamp Track]

 [Plugins]

 [Watrack MPD]

+#muuid {fc718bc7-abc8-43cd-aad9-761614617738}

+;============================================================

+;  File: wbOSD.dll

+;  Plugin: WannaBe OSD

+;  Version: 0.2.1.0

+;  Authors: Andrej Krutak

+;============================================================

+[Shows new message/status change info using onscreen display.]

+;file \plugins\wbOSD\res\wbOSD.rc

+[Dialog]

+[Radio1]

+[Select font]

+[Text color]

+[Background color]

+[Transparent]

+[Shadow color]

+[Alternative shadow]

+[Shadow align]

+[General]

+[Shadow]

+[Align]

+[Shadow distance:]

+[Other]

+[Alpha:]

+[Announce]

+[Timeout (ms):]

+[Show]

+[Show events]

+[Status changes]

+[Show testing OSD]

+[Show my status changes]

+[Show message window after click]

+[Static]

+[Format:]

+[Show when my status is:]

+;file \plugins\wbOSD\src\events.cpp

+[%s is %s]

+;file \plugins\wbOSD\src\options.cpp

+[Plugins]

+[OSD]

 #muuid {6b612a34-dcf2-4e32-85cf-b6fd006b745e}

 ;============================================================

 ;  File: Weather.dll

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 92475a8739..6c6a504769 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -45,8 +45,8 @@
 [Login error: Some Facebook things are required.]

 [Your account requires HTTPS connection. Activating.]

 [Login error: Captcha code is required. Bad login credentials?]

-[Unknown login error]

-[Login error: ]

+[Login error: %s]

+[Unknown error]

 [Login error, probably bad login credentials.]

 [Something happened to Facebook. Maybe there was some major update so you should wait for an update.]

 [Need confirmation for sending messages to other clients.\nOpen facebook website and try to send message to this contact again!]

@@ -75,6 +75,7 @@
 [Sample newsfeed]

 [Sample notification]

 ;file \protocols\FacebookRM\src\json.cpp

+[Message read: %s]

 [Multichat]

 ;file \protocols\FacebookRM\src\messages.cpp

 [You cannot send messages when you are offline.]

@@ -97,16 +98,18 @@
 [Loading newsfeeds...]

 [Checking friend requests...]

 [Refreshing buddy list...]

-[Do you want to cancel your friendship with '%s'?]

 ;file \protocols\FacebookRM\src\theme.cpp

-[Facebook Icon]

+[Facebook icon]

 [Mind]

+[Poke]

 [Cancel friendship]

 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

-[Visit Profile]

+[Visit profile]

+[Visit friendship details]

 [Mind...]

+[Visit Profile]

 [Services...]

 [Refresh Buddy List]

 [Services]

diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt
index 0b1c783854..43ea3a417e 100644
--- a/langpacks/english/Plugins/PManagerEx.txt
+++ b/langpacks/english/Plugins/PManagerEx.txt
@@ -9,8 +9,9 @@
 ;file \plugins\ProfileManager\src\pmanagerEx.cpp

 [Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?]

 [Check Database]

-[Database]

 [Load profile]

 [Change profile]

 [Check database]

 [Restart]

+[Profile manager]

+[Database]

diff --git a/langpacks/english/Plugins/wbOSD.txt b/langpacks/english/Plugins/wbOSD.txt
new file mode 100644
index 0000000000..509829f658
--- /dev/null
+++ b/langpacks/english/Plugins/wbOSD.txt
@@ -0,0 +1,40 @@
+#muuid {fc718bc7-abc8-43cd-aad9-761614617738}

+;============================================================

+;  File: wbOSD.dll

+;  Plugin: WannaBe OSD

+;  Version: 0.2.1.0

+;  Authors: Andrej Krutak

+;============================================================

+[Shows new message/status change info using onscreen display.]

+;file \plugins\wbOSD\res\wbOSD.rc

+[Dialog]

+[Radio1]

+[Select font]

+[Text color]

+[Background color]

+[Transparent]

+[Shadow color]

+[Alternative shadow]

+[Shadow align]

+[General]

+[Shadow]

+[Align]

+[Shadow distance:]

+[Other]

+[Alpha:]

+[Announce]

+[Timeout (ms):]

+[Show]

+[Show events]

+[Status changes]

+[Show testing OSD]

+[Show my status changes]

+[Show message window after click]

+[Static]

+[Format:]

+[Show when my status is:]

+;file \plugins\wbOSD\src\events.cpp

+[%s is %s]

+;file \plugins\wbOSD\src\options.cpp

+[Plugins]

+[OSD]