diff options
57 files changed, 108 insertions, 119 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 1915642d3b..0f06fb08ee 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -942,7 +942,6 @@ [Message log]
[** New contacts **]
[** Unknown contacts **]
-[Show balloon popup (unsupported system)]
[Messaging log]
[Typing notify]
;file \src\core\stdmsg\src\msgs.cpp
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt index 82a17303f0..dedd897ab4 100644 --- a/langpacks/english/Plugins/AdvancedAutoAway.txt +++ b/langpacks/english/Plugins/AdvancedAutoAway.txt @@ -83,7 +83,7 @@ [Show when a connection attempt is made]
[Show when reconnection has finished]
[Show other messages]
-[From Popup plugin]
+[From popup plugin]
[Custom]
[Permanent]
[Show additional information in popups]
diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt index fb8f7b9f2b..f8828dd406 100644 --- a/langpacks/english/Plugins/AvatarHistory.txt +++ b/langpacks/english/Plugins/AvatarHistory.txt @@ -27,7 +27,7 @@ [Use Windows colors]
[Use default colors]
[Delay]
-[From Popup plugin]
+[From popup plugin]
[Custom]
[Permanent]
[Actions]
diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt index d9038d2e50..670c4fd0f5 100644 --- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt +++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt @@ -31,7 +31,7 @@ [Back]
[Text]
[Timeout]
-[From Popup plugin]
+[From popup plugin]
[Permanent]
[Custom]
[On left click]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index 3ebca0c5c8..aa4de0d27c 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Clist_modern.dll
; Plugin: Modern contact list
-; Version: 0.9.1.4
+; Version: 0.9.1.5
; Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven
;============================================================
[Displays contacts, event notifications, protocol status with advanced visual modifications. Supported multi-window modifications, enhanced metacontact cooperation.]
@@ -206,7 +206,7 @@ [Round corners]
[Non-layered mode]
[Disable skin engine]
-[Enable Aero Glass (Vista+)]
+[Enable Aero Glass (Vista, Win 7)]
[Order of items:]
[Minimum row height:]
[Row border:]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index 5bebfcb6cd..4b584373a5 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.14.3
+; Version: 0.3.0.0
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
@@ -53,8 +53,8 @@ [Multi user chats]
[Enable multi user chats support]
[Do not open chat windows on creation]
+[Automatically join active chats that exist in contact list]
[History synchronization]
-[Load last messages (24 hours old) on login (EXPERIMENTAL)]
[Load last messages on opening message window (EXPERIMENTAL)]
[Number of messages to load:]
[Facebook Login Approval]
@@ -143,6 +143,9 @@ ;file \protocols\FacebookRM\src\process.cpp
[Contact is back on server-list.]
[Contact is no longer on server-list.]
+[Loading history started.]
+[Loading messages: %d/%d]
+[Loading history completed.]
[<attachment without text>]
[On this day]
;file \protocols\FacebookRM\src\proto.cpp
@@ -160,6 +163,8 @@ [Loading friendship requests...]
[Loading notifications...]
[Loading memories...]
+[Loading history is already in progress. It can't run for more contacts at once so please wait until it finishes.]
+[This will load all messages from the server. To avoid having duplicate messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?]
[Do you want to cancel your friendship with '%s'?]
[Client errors]
[Wall posts]
@@ -194,6 +199,7 @@ [Wow]
[Visit friendship details]
[Visit conversation]
+[Load history]
[Cancel friendship]
[Cancel friendship request]
[Request friendship]
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt index 9235d21f78..37746812ad 100644 --- a/langpacks/english/Plugins/FileAsMessage.txt +++ b/langpacks/english/Plugins/FileAsMessage.txt @@ -23,6 +23,8 @@ [Use only alphanumeric encoding on transfer]
[Go to Options -> Events -> File Transfers, "Receiving files" group for extra settings]
;file \plugins\FileAsMessage\src\dialog.cpp
+[Receive file]
+[Send file]
[File already exists. Overwrite?]
[Couldn't open a file]
[Size: %d bytes]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt index 937d7559c5..2714d4e29c 100644 --- a/langpacks/english/Plugins/IRC.txt +++ b/langpacks/english/Plugins/IRC.txt @@ -169,8 +169,8 @@ [%us]
[online since %s, idle %s]
[Change nickname]
-[IRC error]
[Unknown]
+[IRC error]
[Please enter the hostmask (nick!user@host)\nNOTE! Contacts on your contact list are never ignored]
[Ignore]
[Please enter the reason]
@@ -328,7 +328,6 @@ [Please enter the notice text]
[Please enter the channel name to invite to]
[Invite to channel]
-[NickServ]
[Register nick]
[Auth nick]
[Remind password]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 04adcbb3d9..c0124840ef 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -86,7 +86,6 @@ [Home]
[Work]
[Internet]
-[X400]
[Jabber vCard: Add Phone Number]
[Phone number:]
[Voice]
@@ -95,10 +94,7 @@ [Text/Messaging]
[Cellular]
[Video]
-[BBS]
[Modem]
-[ISDN]
-[PCS]
[Load]
[Save]
[Delete]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt index 52aa358fc9..1170a32724 100644 --- a/langpacks/english/Plugins/KeepStatus.txt +++ b/langpacks/english/Plugins/KeepStatus.txt @@ -83,7 +83,7 @@ [Show when a connection attempt is made]
[Show when reconnection has finished]
[Show other messages]
-[From Popup plugin]
+[From popup plugin]
[Custom]
[Permanent]
[Show additional information in popups]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt index 5e33150bfc..1d6a4d69c2 100644 --- a/langpacks/english/Plugins/MSN.txt +++ b/langpacks/english/Plugins/MSN.txt @@ -31,7 +31,6 @@ [Blocked contact]
[Somebody included you in his/her server list]
[Refresh]
-[Hotmail]
[Enable Popup notifications]
[Enable Contact List notifications]
[Enable Tray notifications]
diff --git a/langpacks/english/Plugins/MirandaG15.txt b/langpacks/english/Plugins/MirandaG15.txt index e5056147af..33d95571da 100644 --- a/langpacks/english/Plugins/MirandaG15.txt +++ b/langpacks/english/Plugins/MirandaG15.txt @@ -101,7 +101,6 @@ [Close chat after]
[When in background]
;file \plugins\MirandaG15\src\CConfig.cpp
-[MirandaG15]
[Appearance]
[Notifications]
[Chat sessions]
diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt index bcd3207f5e..9ad954f142 100644 --- a/langpacks/english/Plugins/NotesReminders.txt +++ b/langpacks/english/Plugins/NotesReminders.txt @@ -2,7 +2,7 @@ ;============================================================
; File: NotesReminders.dll
; Plugin: Sticky Notes & Reminders
-; Version: 0.0.5.1
+; Version: 0.1.0.1
; Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
;============================================================
[Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -134,7 +134,7 @@ [Aqua]
[White]
[Are you sure you want to delete this note?]
-[Visible]
+[bVisible]
[Top]
[Notes]
[Note text]
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index 981eba7443..1c671fd602 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -43,7 +43,7 @@ [Background color]
[Text color]
[Delay]
-[From Popup plugin]
+[From popup plugin]
[Custom]
[Permanent]
[Do not add to popup's history]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index bddfe2aab3..150302508a 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -143,7 +143,6 @@ [Wikipedia (en)]
[Google Maps]
[Google Translate]
-[Foodnetwork]
[C&lear log]
[&Open link]
[&Copy link]
@@ -302,7 +301,6 @@ [On the phone]
[** New contacts **]
[** Unknown contacts **]
-[Show balloon popup (unsupported system)]
[Message sessions]
[Typing notify]
;file \plugins\Scriver\src\msgs.cpp
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt index 92843369af..21f5e65c55 100644 --- a/langpacks/english/Plugins/SkypeWeb.txt +++ b/langpacks/english/Plugins/SkypeWeb.txt @@ -2,7 +2,7 @@ ;============================================================
; File: SkypeWeb.dll
; Plugin: Skype protocol (Web)
-; Version: 0.12.2.2
+; Version: 0.12.2.3
; Authors: Miranda NG Team
;============================================================
[Skype protocol support for Miranda NG. Based on new Skype for Web.]
@@ -36,12 +36,12 @@ [Warning]
[&Invite user...]
[&Leave chat session]
-[&Change topic]
+[&Change topic...]
[Kick &user]
[Set &role]
[&Admin]
[&User]
-[Change nick]
+[Change nick...]
[Enter new chatroom topic]
;file \protocols\SkypeWeb\src\skype_contacts.cpp
[Are you sure?]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt index fbb8d69a83..d52d61d1a9 100644 --- a/langpacks/english/Plugins/StartupStatus.txt +++ b/langpacks/english/Plugins/StartupStatus.txt @@ -83,7 +83,7 @@ [Show when a connection attempt is made]
[Show when reconnection has finished]
[Show other messages]
-[From Popup plugin]
+[From popup plugin]
[Custom]
[Permanent]
[Show additional information in popups]
diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt index e5003234f6..cd6372c636 100644 --- a/langpacks/english/Plugins/Steam.txt +++ b/langpacks/english/Plugins/Steam.txt @@ -17,7 +17,6 @@ [Show chat state events (i.e., user closed chat session)]
[Captcha]
[Cancel]
-[Steam Guard]
[As an added account security measure, you'll need to grant access by entering the special code we've just sent to your email address.]
[Go to email domain]
[Block]
@@ -58,7 +57,6 @@ [Protocol icon]
[Gaming icon]
[%s connection]
-[SteamID]
[You cannot send messages when you are offline.]
;file \protocols\Steam\src\steam_utils.cpp
[closed chat session]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 7b9b73ed97..b929b413d4 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -2,7 +2,7 @@ ;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.4.0.12
+; Version: 3.4.1.2
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
@@ -252,7 +252,7 @@ [Only &one popup for each contact]
[Show &entry in the main menu]
[...is typing]
-[From Popup plugin]
+[From popup plugin]
[From protocol]
[Permanent]
[Custom]
@@ -687,7 +687,6 @@ [You have chosen to use an external plugin for displaying the message history in the chat window. Most of the settings on this page are for the standard message log viewer only and will have no effect. To change the appearance of the message log, you must configure either IEView or History++.]
[** New contacts **]
[** Unknown contacts **]
-[Show balloon popup (unsupported system)]
[Always]
[Always, but no popup when window is focused]
[Only when no message window is open]
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt index 677fccc84d..cd4a6560f9 100644 --- a/langpacks/english/Plugins/Tlen.txt +++ b/langpacks/english/Plugins/Tlen.txt @@ -46,7 +46,7 @@ [Background]
[Text]
[Delay]
-[&From Popup plugin]
+[&From popup plugin]
[&Custom]
[P&ermanent]
[Preview]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index c03205be9e..6b525fbe77 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -71,7 +71,7 @@ [Use Windows colors]
[Use default colors]
[Delay]
-[From Popup plugin]
+[From popup plugin]
[Custom]
[Permanent]
[Show reminder messages as popups (if reminder is enabled)]
@@ -311,11 +311,8 @@ [Main]
;file \plugins\UserInfoEx\src\mir_icolib.h
[Extended user info]
-[Extended user info/Zodiacs]
-[Extended user info/Dialogs]
-[Extended user info/Buttons]
-[Extended user info/Treeview]
-[Extended user info/Reminder]
+[Dialogs]
+[Buttons]
;file \plugins\UserInfoEx\src\mir_menuitems.cpp
[Export/import contact]
[User &details]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index e6311d455e..2a06ef4166 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.2.4
+; Version: 0.1.2.5
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -120,10 +120,12 @@ [VKontakte]
[Access denied! Data will not be sent or received.]
[Error]
-[You must validate your account before use VK in Miranda NG]
+[You have to validate your account before you can use VK in Miranda NG]
[Error %d. Data will not be sent or received.]
[One of the parameters specified was missing or invalid]
[Access to adding post denied]
+[Enter the missing digits between %s and %s of the phone number linked to your account]
+[Attention!]
[Enter confirmation code]
[Enter new nickname]
[Message read: %s]
@@ -188,7 +190,7 @@ [%s is typing a message...]
;file \protocols\VKontakte\src\vk_dialogs.cpp
[Enter the text you see]
-[Wall message for]
+[Wall message for %s]
;file \protocols\VKontakte\src\vk_feed.cpp
[New news]
[New notifications]
@@ -222,13 +224,12 @@ [Unknown error occurred]
;file \protocols\VKontakte\src\vk_history.cpp
[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]
-[Attention!]
[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?]
-[Error loading message history from server]
-[Loading messages for all contacts is completed]
+[Error loading message history from server.]
+[Loading messages for all contacts is completed.]
[Loading history]
-[for]
-[Loading messages for %s is completed]
+[Error loading message history for %s from server.]
+[Loading messages for %s is completed.]
;file \protocols\VKontakte\src\vk_options.cpp
[Network]
[Account]
@@ -281,6 +282,7 @@ ;file \protocols\VKontakte\src\vk_struct.cpp
[I\'m back]
;file \protocols\VKontakte\src\vk_thread.cpp
+[Service message]
[Interests]
[Activities]
[Music]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt index 8bfea68814..0f62440b13 100644 --- a/langpacks/english/Plugins/Weather.txt +++ b/langpacks/english/Plugins/Weather.txt @@ -80,7 +80,7 @@ [Popup Delay]
[Delay]
[seconds]
-[From Popup plugin]
+[From popup plugin]
[Permanent]
[Popup Text]
[Popup Title]
diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt index f6621f9f93..b18973ec45 100644 --- a/langpacks/english/Plugins/WebView.txt +++ b/langpacks/english/Plugins/WebView.txt @@ -71,7 +71,7 @@ [Save as raw data]
[Popup delay]
[Delay]
-[From Popup plugin]
+[From popup plugin]
[Permanent]
[Preview]
[Colors]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt index 61386a1f14..114a3661bd 100644 --- a/langpacks/english/Plugins/YAMN.txt +++ b/langpacks/english/Plugins/YAMN.txt @@ -17,7 +17,6 @@ [Name:]
[Server:]
[Port:]
-[APOP]
[User Name:]
[Password:]
[Codepage:]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt index e079ec2509..1c54d9f47a 100644 --- a/langpacks/english/Plugins/Yahoo.txt +++ b/langpacks/english/Plugins/Yahoo.txt @@ -17,7 +17,6 @@ [Auto login to Yahoo Website(s)]
[Display Yahoo notifications]
[Show Errors]
-[Yahoo Japan]
[Create a new Yahoo account]
[Connection Settings]
[Login server:]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index c2b40d1db7..8ac27eecfe 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -1799,8 +1799,6 @@ UIN, E-mail и т.д. ** Новые контакты **
[** Unknown contacts **]
** Неизвестные контакты **
-[Show balloon popup (unsupported system)]
-Показывать подсказки (неподдерживаемая система)
[Messaging log]
Журнал
[Typing notify]
diff --git a/langpacks/russian/Plugins/AdvancedAutoAway.txt b/langpacks/russian/Plugins/AdvancedAutoAway.txt index 252617ea00..3698e0a841 100644 --- a/langpacks/russian/Plugins/AdvancedAutoAway.txt +++ b/langpacks/russian/Plugins/AdvancedAutoAway.txt @@ -159,7 +159,7 @@ Успешное подключение
[Show other messages]
Другие
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Custom]
Настроить
diff --git a/langpacks/russian/Plugins/AvatarHistory.txt b/langpacks/russian/Plugins/AvatarHistory.txt index d61267695c..63888f5224 100644 --- a/langpacks/russian/Plugins/AvatarHistory.txt +++ b/langpacks/russian/Plugins/AvatarHistory.txt @@ -47,7 +47,7 @@ Цвета по умолчанию
[Delay]
Задержка
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Custom]
Настроить
diff --git a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt index dfb5c5b17f..9161114e57 100644 --- a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt +++ b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt @@ -55,7 +55,7 @@ Текст
[Timeout]
Таймаут
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Permanent]
Постоянно
diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt index 9417735fb3..5a9c1a0933 100644 --- a/langpacks/russian/Plugins/Clist_modern.txt +++ b/langpacks/russian/Plugins/Clist_modern.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Clist_modern.dll
; Plugin: Modern contact list
-; Version: 0.9.1.4
+; Version: 0.9.1.5
; Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven
;============================================================
[Displays contacts, event notifications, protocol status with advanced visual modifications. Supported multi-window modifications, enhanced metacontact cooperation.]
@@ -405,8 +405,8 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик Режим без скинов
[Disable skin engine]
Выключить скины
-[Enable Aero Glass (Vista+)]
-Стиль Аэро (Vista и выше)
+[Enable Aero Glass (Vista, Win 7)]
+Включить Aero Glass (Vista, Win 7)
[Order of items:]
Порядок элементов:
[Minimum row height:]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt index 1c3b03b5fb..0cba3f738b 100644 --- a/langpacks/russian/Plugins/Facebook.txt +++ b/langpacks/russian/Plugins/Facebook.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.14.3
+; Version: 0.3.0.0
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
@@ -97,10 +97,10 @@ Включить поддержку многопользовательских чатов
[Do not open chat windows on creation]
Не открывать окна комнат чата при создании
+[Automatically join active chats that exist in contact list]
+Автоматически подключаться к активным чатом из списка контактов
[History synchronization]
Синхронизация истории
-[Load last messages (24 hours old) on login (EXPERIMENTAL)]
-Загрузка сообщений за последние 24 часа при входе (Экспериментально)
[Load last messages on opening message window (EXPERIMENTAL)]
Подгружать последние сообщения при открытии окна (Экспериментально)
[Number of messages to load:]
@@ -255,6 +255,12 @@ SMS с кодом подтверждения отправлено на ваш м Контакт снова в списке на сервере.
[Contact is no longer on server-list.]
Контакта больше нет в списке на сервере.
+[Loading history started.]
+Загрузка истории начата.
+[Loading messages: %d/%d]
+Загружено сообщений: %d/%d
+[Loading history completed.]
+Загрузка истории завершина.
[<attachment without text>]
<вложение без текста>
[On this day]
@@ -287,6 +293,10 @@ SMS с кодом подтверждения отправлено на ваш м Загрузка уведомлений...
[Loading memories...]
Загрузка воспоминаний...
+[Loading history is already in progress. It can't run for more contacts at once so please wait until it finishes.]
+Выполняется загрузка истории. Данная возможность не работает для нескольких контактов, пожалуйста, подождите, завершения.
+[This will load all messages from the server. To avoid having duplicate messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?]
+Все сообщения будут загружены с сервера. Чтобы избежать дублирования сообщений в истории - прежде чем продолжить, удалите существующие сообщения вручную.\nПроцесс загрузки может занять некоторое время.\n\nВы хотите продолжить?
[Do you want to cancel your friendship with '%s'?]
Вы уверены, что хотите удалить '%s' из друзей?
[Client errors]
@@ -353,6 +363,8 @@ SMS с кодом подтверждения отправлено на ваш м Информация о дружбе
[Visit conversation]
Беседа на сайте
+[Load history]
+Загрузить историю
[Cancel friendship]
Удалить из друзей
[Cancel friendship request]
diff --git a/langpacks/russian/Plugins/FileAsMessage.txt b/langpacks/russian/Plugins/FileAsMessage.txt index 3fde58b137..a51bf6d4e2 100644 --- a/langpacks/russian/Plugins/FileAsMessage.txt +++ b/langpacks/russian/Plugins/FileAsMessage.txt @@ -37,6 +37,10 @@ Только буквенно-цифровая кодировка для передачи
[Go to Options -> Events -> File Transfers, "Receiving files" group for extra settings]
Дополнительные настройки находятся в группе "Приём файлов" раздела "Настройки -> События -> Передача файлов"
+[Receive file]
+Получить файл
+[Send file]
+Отправить файл
[File already exists. Overwrite?]
Файл уже есть. Перезаписать?
[Couldn't open a file]
diff --git a/langpacks/russian/Plugins/IRC.txt b/langpacks/russian/Plugins/IRC.txt index a856ae8257..43d7e6e752 100644 --- a/langpacks/russian/Plugins/IRC.txt +++ b/langpacks/russian/Plugins/IRC.txt @@ -327,10 +327,10 @@ DCC: Запрос на продолжение закачки файла от %s в сети с %s, простаивает %s
[Change nickname]
Сменить ник
-[IRC error]
-Ошибка IRC
[Unknown]
Неизвестно
+[IRC error]
+Ошибка IRC
[Please enter the hostmask (nick!user@host)\nNOTE! Contacts on your contact list are never ignored]
Введите маску (nick!user@host)\nВнимание: пользователи из списка контактов не будут игнорироваться
[Ignore]
diff --git a/langpacks/russian/Plugins/KeepStatus.txt b/langpacks/russian/Plugins/KeepStatus.txt index b246ec28de..4a1babdc0a 100644 --- a/langpacks/russian/Plugins/KeepStatus.txt +++ b/langpacks/russian/Plugins/KeepStatus.txt @@ -159,7 +159,7 @@ Cтатус-профиль Успешное подключение
[Show other messages]
Другие
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Custom]
Настроить
diff --git a/langpacks/russian/Plugins/NotesReminders.txt b/langpacks/russian/Plugins/NotesReminders.txt index 1b2604bfab..01cc4350a4 100644 --- a/langpacks/russian/Plugins/NotesReminders.txt +++ b/langpacks/russian/Plugins/NotesReminders.txt @@ -2,7 +2,7 @@ ;============================================================
; File: NotesReminders.dll
; Plugin: Sticky Notes & Reminders
-; Version: 0.0.5.1
+; Version: 0.1.0.1
; Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer
;============================================================
[Sticky Notes & Reminders Implementation for Miranda NG.]
@@ -249,8 +249,6 @@ Miranda не смогла загрузить плагин Notes & Reminders из Белый
[Are you sure you want to delete this note?]
Уверены, что хотите удалить заметку?
-[Visible]
-Видимая
[Top]
Поверх
[Notes]
diff --git a/langpacks/russian/Plugins/Quotes.txt b/langpacks/russian/Plugins/Quotes.txt index 24d4c49a9f..f3921c7762 100644 --- a/langpacks/russian/Plugins/Quotes.txt +++ b/langpacks/russian/Plugins/Quotes.txt @@ -77,7 +77,7 @@ Цвет текста
[Delay]
Задержка
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Custom]
Настроить
diff --git a/langpacks/russian/Plugins/Scriver.txt b/langpacks/russian/Plugins/Scriver.txt index c346037958..a0c4753660 100644 --- a/langpacks/russian/Plugins/Scriver.txt +++ b/langpacks/russian/Plugins/Scriver.txt @@ -579,8 +579,6 @@ Google Карты ** Новые контакты **
[** Unknown contacts **]
** Неизвестные контакты **
-[Show balloon popup (unsupported system)]
-Показывать подсказки (неподдерживаемая система)
[Message sessions]
Беседы
[Typing notify]
diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt index 94a7ad8172..84fd4a1e43 100644 --- a/langpacks/russian/Plugins/SkypeWeb.txt +++ b/langpacks/russian/Plugins/SkypeWeb.txt @@ -2,7 +2,7 @@ ;============================================================
; File: SkypeWeb.dll
; Plugin: Skype protocol (Web)
-; Version: 0.12.2.2
+; Version: 0.12.2.3
; Authors: Miranda NG Team
;============================================================
[Skype protocol support for Miranda NG. Based on new Skype for Web.]
@@ -61,8 +61,8 @@ &Пригласить пользователя...
[&Leave chat session]
Покин&уть чат
-[&Change topic]
-&Изменить тему
+[&Change topic...]
+&Изменить тему...
[Kick &user]
&Выкинуть пользователя
[Set &role]
@@ -71,8 +71,8 @@ &Админ
[&User]
&Пользователь
-[Change nick]
-Изменить имя
+[Change nick...]
+Изменить имя...
[Enter new chatroom topic]
Введите новую тему комнаты чата
[Are you sure?]
diff --git a/langpacks/russian/Plugins/StartupStatus.txt b/langpacks/russian/Plugins/StartupStatus.txt index 6e995b12ff..5bb5df6d01 100644 --- a/langpacks/russian/Plugins/StartupStatus.txt +++ b/langpacks/russian/Plugins/StartupStatus.txt @@ -159,7 +159,7 @@ Cтатус-профиль Успешное подключение
[Show other messages]
Другие
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Custom]
Настроить
diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt index 0f0dcbaf87..2a810f3168 100644 --- a/langpacks/russian/Plugins/TabSRMM.txt +++ b/langpacks/russian/Plugins/TabSRMM.txt @@ -2,7 +2,7 @@ ;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.4.0.12
+; Version: 3.4.1.2
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
@@ -493,7 +493,7 @@ Cтатусы для автоматического создания вклад &Пункт в главном меню
[...is typing]
...набирает текст
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[From protocol]
Из протокола
@@ -1333,8 +1333,6 @@ TabSRMM: набирает ** Новые контакты **
[** Unknown contacts **]
** Неизвестные контакты **
-[Show balloon popup (unsupported system)]
-Показывать подсказки (неподдерживаемая система)
[Always]
Всегда
[Always, but no popup when window is focused]
diff --git a/langpacks/russian/Plugins/Tlen.txt b/langpacks/russian/Plugins/Tlen.txt index 0901e11063..45b9d9ddb8 100644 --- a/langpacks/russian/Plugins/Tlen.txt +++ b/langpacks/russian/Plugins/Tlen.txt @@ -83,7 +83,7 @@ P2P Подключения Текст
[Delay]
Задержка
-[&From Popup plugin]
+[&From popup plugin]
&Установки Popup
[&Custom]
&Настроить
diff --git a/langpacks/russian/Plugins/UInfoEx.txt b/langpacks/russian/Plugins/UInfoEx.txt index 3807603a2d..c0a6136a24 100644 --- a/langpacks/russian/Plugins/UInfoEx.txt +++ b/langpacks/russian/Plugins/UInfoEx.txt @@ -133,7 +133,7 @@ Цвета по умолчанию
[Delay]
Задержка
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Custom]
Настроить
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index fb4dd80013..1014832f17 100644 --- a/langpacks/russian/Plugins/VKontakte.txt +++ b/langpacks/russian/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.2.4
+; Version: 0.1.2.5
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -229,14 +229,18 @@ Cоздать комнату чата Отказ в доступе! Данные не будут приняты или отправлены.
[Error]
Ошибка
-[You must validate your account before use VK in Miranda NG]
-Перед использованием протокола ВКонтакте в Miranda NG вы должны подтвердить свою учётную запись
+[You have to validate your account before you can use VK in Miranda NG]
+Вы должны подтвердить свой аккаунт, перед использованием ВК в Miranda NG
[Error %d. Data will not be sent or received.]
Ошибка %d. Данные не будут приняты или отправлены.
[One of the parameters specified was missing or invalid]
Один из заданных параметров отсутствует или неверен
[Access to adding post denied]
Превышено ограничение на число публикаций в сутки
+[Enter the missing digits between %s and %s of the phone number linked to your account]
+Введите недостающие цифры между %s и %s в телефонном номере привязанном к вашему аккаунту
+[Attention!]
+Внимание!
[Enter confirmation code]
Введите код подтверждения
[Enter new nickname]
@@ -361,8 +365,8 @@ Cоздать комнату чата %s набирает текст...
[Enter the text you see]
Введите текст, который видите
-[Wall message for]
-Сообщение на стене пользователя
+[Wall message for %s]
+Сообщение на стену для %s
[New news]
Новости
[New notifications]
@@ -423,20 +427,18 @@ ID получателя ошибочен или неизвестен Неизвестная ошибка
[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]
Вы уверены, что хотите загрузить все сообщения с сайта vk.com?\nЛокальная история контакта будет удалена и загружена с сервера.\nЭто может занять много времени.\nВы уверены, что хотите продолжить?
-[Attention!]
-Внимание!
[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?]
Вы уверены, что хотите перезагрузить все сообщения для всех контактов из vk.com?\nЛокальная история контактов будет удалена и перезагружена с сервера.\nЭто может занять продолжительное время и/или повредить базу данных.\nРекомендуем проверить вашу базу данных (Miranda32.exe /svc:dbchecker или Miranda64.exe /svc:dbchecker) перед повторной загрузкой сообщений и после её.\nХотите продолжить?
-[Error loading message history from server]
-Ошибка загрузки истории сообщений с сервера
-[Loading messages for all contacts is completed]
-Загрузка сообщений для всех контактов завершена
+[Error loading message history from server.]
+Ошибка загрузки истории сообщений с сервера.
+[Loading messages for all contacts is completed.]
+Загрузка сообщений для всех контактов завершена.
[Loading history]
Загрузка истории
-[for]
-в течение
-[Loading messages for %s is completed]
-Загрузка сообщений для %s завершена
+[Error loading message history for %s from server.]
+Ошибка загрузки истории сообщений для %s с сервера.
+[Loading messages for %s is completed.]
+Загрузка сообщений для %s завершена.
[Network]
Сеть
[Account]
@@ -531,6 +533,8 @@ ID получателя ошибочен или неизвестен Введите новое сообщение статуса
[I\'m back]
Я вернулся
+[Service message]
+Сервисное сообщение
[Interests]
Интересы
[Activities]
diff --git a/langpacks/russian/Plugins/Weather.txt b/langpacks/russian/Plugins/Weather.txt index e914c977ad..1cd44447b7 100644 --- a/langpacks/russian/Plugins/Weather.txt +++ b/langpacks/russian/Plugins/Weather.txt @@ -153,7 +153,7 @@ URL доп. информации Задержка
[seconds]
секунд
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Permanent]
Постоянно
diff --git a/langpacks/russian/Plugins/WebView.txt b/langpacks/russian/Plugins/WebView.txt index 681a653d0c..c28be6cc3f 100644 --- a/langpacks/russian/Plugins/WebView.txt +++ b/langpacks/russian/Plugins/WebView.txt @@ -91,7 +91,7 @@ Задержка окна
[Delay]
Задержка
-[From Popup plugin]
+[From popup plugin]
По умолчанию
[Permanent]
Постоянно
diff --git a/langpacks/russian/Plugins/Yahoo.txt b/langpacks/russian/Plugins/Yahoo.txt index b948856bbb..feb5c674d0 100644 --- a/langpacks/russian/Plugins/Yahoo.txt +++ b/langpacks/russian/Plugins/Yahoo.txt @@ -25,8 +25,6 @@ Показывать уведомления Yahoo
[Show Errors]
Показывать ошибки
-[Yahoo Japan]
-Yahoo Япония
[Create a new Yahoo account]
Создать новую учётную запись Yahoo
[Connection Settings]
diff --git a/langpacks/russian/Untranslated/IRC.txt b/langpacks/russian/Untranslated/IRC.txt index 968037d34f..a428f4a37f 100644 --- a/langpacks/russian/Untranslated/IRC.txt +++ b/langpacks/russian/Untranslated/IRC.txt @@ -1,3 +1,2 @@ [Jerk]
-[NickServ]
[Settings could not be saved!\n\nA full hostmask must be set for this online detection mode to work.]
diff --git a/langpacks/russian/Untranslated/Jabber.txt b/langpacks/russian/Untranslated/Jabber.txt index cd866cc241..4b5dcc2b94 100644 --- a/langpacks/russian/Untranslated/Jabber.txt +++ b/langpacks/russian/Untranslated/Jabber.txt @@ -1,8 +1,4 @@ -[X400]
-[BBS]
-[ISDN]
-[PCS]
-[JID:]
+[JID:]
[Google Talk!]
[League Of Legends (EU Nordic)]
[League Of Legends (EU West)]
diff --git a/langpacks/russian/Untranslated/MSN.txt b/langpacks/russian/Untranslated/MSN.txt index 582ed9eade..f39df77b51 100644 --- a/langpacks/russian/Untranslated/MSN.txt +++ b/langpacks/russian/Untranslated/MSN.txt @@ -1,5 +1,4 @@ [Live ID:]
-[Hotmail]
[Live ID]
[IID_IOleObject failed.]
[IID_IOleInPlaceObject failed.]
diff --git a/langpacks/russian/Untranslated/MirandaG15.txt b/langpacks/russian/Untranslated/MirandaG15.txt deleted file mode 100644 index 5f2500b34e..0000000000 --- a/langpacks/russian/Untranslated/MirandaG15.txt +++ /dev/null @@ -1 +0,0 @@ -[MirandaG15]
diff --git a/langpacks/russian/Untranslated/NotesReminders.txt b/langpacks/russian/Untranslated/NotesReminders.txt index d5aebb26aa..737cc7c298 100644 --- a/langpacks/russian/Untranslated/NotesReminders.txt +++ b/langpacks/russian/Untranslated/NotesReminders.txt @@ -1,2 +1,3 @@ [reftime]
[Context Menu Note Popup]
+[bVisible]
diff --git a/langpacks/russian/Untranslated/Scriver.txt b/langpacks/russian/Untranslated/Scriver.txt index 3432edc948..680e2937b7 100644 --- a/langpacks/russian/Untranslated/Scriver.txt +++ b/langpacks/russian/Untranslated/Scriver.txt @@ -1,4 +1,3 @@ [Wikipedia (en)]
-[Foodnetwork]
[Lorem ipsum dolor sit amet,]
[consectetur adipisicing elit]
diff --git a/langpacks/russian/Untranslated/Steam.txt b/langpacks/russian/Untranslated/Steam.txt deleted file mode 100644 index 38c4f20f70..0000000000 --- a/langpacks/russian/Untranslated/Steam.txt +++ /dev/null @@ -1,2 +0,0 @@ -[Steam Guard]
-[SteamID]
diff --git a/langpacks/russian/Untranslated/UInfoEx.txt b/langpacks/russian/Untranslated/UInfoEx.txt index 246605d47f..023069539f 100644 --- a/langpacks/russian/Untranslated/UInfoEx.txt +++ b/langpacks/russian/Untranslated/UInfoEx.txt @@ -1,8 +1,5 @@ [Enter a representative name for the e-mail address here:]
-[Extended user info/Zodiacs]
-[Extended user info/Dialogs]
-[Extended user info/Buttons]
-[Extended user info/Treeview]
-[Extended user info/Reminder]
+[Dialogs]
+[Buttons]
[TmplPast Work Place]
[TmplPast Organization]
diff --git a/langpacks/russian/Untranslated/YAMN.txt b/langpacks/russian/Untranslated/YAMN.txt deleted file mode 100644 index 868343a3d2..0000000000 --- a/langpacks/russian/Untranslated/YAMN.txt +++ /dev/null @@ -1 +0,0 @@ -[APOP]
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index e815af9250..2e3c7c82ce 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -800,7 +800,7 @@ INT_PTR FacebookProto::LoadHistory(WPARAM wParam, LPARAM) CMStringW title; title.AppendFormat(L"%s - %s", m_tszUserName, name); - const wchar_t *message = TranslateT("This will load all messages from the server. To avoid having duplicit messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?"); + const wchar_t *message = TranslateT("This will load all messages from the server. To avoid having duplicate messages in your history, delete existing messages manually before continuing.\nLoading process might take a while, so be patient.\n\nDo you want to continue?"); if (MessageBox(0, message, title, MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2) == IDYES) { ForkThread(&FacebookProto::LoadHistory, new MCONTACT(hContact)); |