summaryrefslogtreecommitdiff
path: root/langpacks/english
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-08-23 15:44:40 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-08-23 15:44:40 +0000
commitb0adb2ab6731429fcbde5bf8ea87373f3c06c0f2 (patch)
tree69d7aff4949c31289859674e98c62a3ce29d24d8 /langpacks/english
parentc8ebd47264f4cfdf0c3dba33a15fd1e7680f9e52 (diff)
langpacks update
git-svn-id: http://svn.miranda-ng.org/main/trunk@15023 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english')
-rw-r--r--langpacks/english/Plugins/Db_autobackups.txt6
-rw-r--r--langpacks/english/Plugins/Facebook.txt1
-rw-r--r--langpacks/english/Plugins/FltContacts.txt2
-rw-r--r--langpacks/english/Plugins/MSN.txt11
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt9
-rw-r--r--langpacks/english/Plugins/SkypeWeb.txt6
-rw-r--r--langpacks/english/Plugins/Tox.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt3
-rw-r--r--langpacks/english/Plugins/Yahoo.txt2
9 files changed, 22 insertions, 20 deletions
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 3129a7ace1..1e1a6ccbcf 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -31,14 +31,14 @@
[Database back up in process...]
[Error]
;file \plugins\Db_autobackups\src\main.cpp
-[Database]
-[Database backups]
[Miranda NG databases]
[Compressed Miranda NG databases]
[All files]
-[Backup folder]
+[Database]
[Backup profile]
[Save profile as...]
+[Database backups]
+[Backup folder]
;file \plugins\Db_autobackups\src\options.cpp
[path to Miranda root folder]
[path to folder containing Miranda profiles]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 415e58fd67..debe098217 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -75,7 +75,6 @@
[Login error: Some Facebook things are required.]
[Login error: Your account is temporarily locked. You need to confirm this device from web browser.]
[Login error: Captcha code is required. You need to confirm this device from web browser.]
-[Facebook required computer cleaning and plugin correctly skipped it. Please report this to the plugin developer!]
[Login error, probably bad login credentials.]
[Could not load communication token. You should report this and wait for plugin update.]
[Could not load all required data. Plugin may still work correctly, but you should report this and wait for plugin update.]
diff --git a/langpacks/english/Plugins/FltContacts.txt b/langpacks/english/Plugins/FltContacts.txt
index ef0bda7c6f..db1433d771 100644
--- a/langpacks/english/Plugins/FltContacts.txt
+++ b/langpacks/english/Plugins/FltContacts.txt
@@ -2,7 +2,7 @@
;============================================================
; File: FltContacts.dll
; Plugin: Floating contacts
-; Version: 0.7.0.2
+; Version: 0.7.0.3
; Authors: Iavor Vajarov, Kosh&chka, Victor Pavlychko
;============================================================
[Floating Contacts plugin for Miranda.]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 7217752061..ae84934b4e 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -60,8 +60,6 @@
[&Invite]
[&Cancel]
[Add]
-;file \protocols\MSN\src\msn_auth.cpp
-[MSN Protocol]
;file \protocols\MSN\src\msn_chat.cpp
[Chat #]
[&Invite user...]
@@ -76,6 +74,7 @@
[MSN Alert]
[Contact tried to open an audio conference (not currently supported)]
[Accept NetMeeting request from %s?]
+[MSN Protocol]
[Chat session established by my request]
[Chat session established by contact request]
[Contact left channel]
@@ -87,6 +86,12 @@
[Message delivery failed]
;file \protocols\MSN\src\msn_errors.cpp
[User not online]
+;file \protocols\MSN\src\msn_ieembed.cpp
+[IID_IOleObject failed.]
+[RESULT]
+[IID_IOleInPlaceObject failed.]
+[Failed to Advise]
+[C++ Event Sink]
;file \protocols\MSN\src\msn_links.cpp
[MSN Link Protocol]
;file \protocols\MSN\src\msn_lists.cpp
@@ -159,5 +164,3 @@
[Convert to Chat]
;file \protocols\MSN\src\msn_ws.cpp
[Chat session dropped due to inactivity]
-;file \protocols\MSN\src\stdafx.h
-[Automatic authentication to MSN failed, possibly due to Captcha-Authentication. Do you want to open a browser window to do a manual login?\n\nThis will not log you in to MSN in Miranda, but it allows you to fix potential problems like entering a captcha that gets asked due to location change or to accept new TOS, which are required only once.\n\nAlso please note that MSN protocol doesn't support two-factor authentication.]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 4a3ffb1fb9..737dd0e48a 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
;============================================================
; File: PluginUpdater.dll
; Plugin: Plugin updater
-; Version: 0.1.2.4
+; Version: 0.1.2.5
; Authors: Mataes, George Hazan
;============================================================
[Install and update plugins and other Miranda NG components.]
@@ -16,11 +16,12 @@
[Select &none]
[Hotkey]
[Go to Customize -> Hotkeys to change the hotkey]
-[Plugin updates options]
+[Update options]
[On startup]
[(but only once a day)]
[Every]
[Silent mode]
+[Backup database before update (requires db_autobackups)]
[Files source]
[Stable version]
[Development version (less stable)]
@@ -81,14 +82,16 @@
[No updates found.]
[Update checking already started!]
;file \plugins\PluginUpdater\src\Events.cpp
+[Plugin updater URI scheme]
;file \plugins\PluginUpdater\src\Notifications.cpp
;file \plugins\PluginUpdater\src\Notifications.h
[Close popup]
[Do nothing]
;file \plugins\PluginUpdater\src\Options.cpp
+[Backup profile after update]
+[Stable version (incompatible with current development version)]
[hours]
[days]
-[Stable version (incompatible with current development version)]
[Test]
[Services]
;file \plugins\PluginUpdater\src\PluginUpdater.cpp
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 28309bfe15..fec31bfb45 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -18,11 +18,10 @@
[Account]
[Others]
[Automatic messages synchronization]
-[Use local time for received messages]
[Always notify as unread for all incoming message]
[Place:]
[Use hostname]
-[Use BB-codes]
+[Use BBCode]
[Enter password]
[Save password]
[Enter the password to continue.]
@@ -86,6 +85,7 @@
[Unblock contact]
[Create new chat]
;file \protocols\SkypeWeb\src\skype_messages.cpp
+[You cannot send when you are offline.]
[Unknown error!]
[Network error!]
;file \protocols\SkypeWeb\src\skype_mslogin.cpp
@@ -104,5 +104,3 @@
;file \protocols\SkypeWeb\src\skype_trouter.cpp
[Failed establish a TRouter connection.]
[Incoming call from %s]
-;file \protocols\SkypeWeb\src\skype_utils.cpp
-[Message read: %s]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 49f329b10e..b822a0596c 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tox.dll
; Plugin: Tox protocol
-; Version: 0.11.1.12
+; Version: 0.11.1.13
; Authors: Miranda NG Team
;============================================================
[Tox protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index b0c373959a..bd93c64d02 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.1.10
+; Version: 0.1.1.12
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -142,7 +142,6 @@
[Document]
[Wall post]
[Link]
-[Image]
[Gift]
[Unsupported or unknown attachment type: %s]
[(Unknown contact)]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index b1294c9e1d..d61f428c70 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -47,7 +47,6 @@
[Invitation reason]
[Add]
;file \protocols\Yahoo\src\chat.cpp
-[[miranda] Got conference invite to room: %s with msg: %s]
[%s denied invitation with message: %s]
[Me]
[Others]
@@ -57,6 +56,7 @@
[User &history]
[Join My Conference...]
[No, thank you...]
+[[miranda] Got conference invite to room: %s with msg: %s]
;file \protocols\Yahoo\src\icolib.cpp
[Main]
[Mail]