diff options
| -rw-r--r-- | langpacks/english/=CORE=.txt | 1 | ||||
| -rw-r--r-- | langpacks/english/Langpack_english.txt | 27 | ||||
| -rw-r--r-- | langpacks/english/Plugins/Quotes.txt | 26 | ||||
| -rw-r--r-- | langpacks/russian/=CORE=.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/AuthState.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/Clist_modern.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/HistoryPP.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/MRA.txt | 4 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/PManagerEx.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/StopSpam.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/StopSpamMod.txt | 2 | ||||
| -rw-r--r-- | langpacks/russian/Plugins/wbOSD.txt | 4 | ||||
| -rw-r--r-- | src/modules/protocols/protoopts.cpp | 4 |
13 files changed, 27 insertions, 53 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 8ef2f134b2..776bb2497a 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1224,6 +1224,7 @@ [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]
[Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.]
+[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
[Create new account]
[Editing account]
[Upgrading account]
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt index f59e6868b9..1f4db1ff94 100644 --- a/langpacks/english/Langpack_english.txt +++ b/langpacks/english/Langpack_english.txt @@ -1225,6 +1225,7 @@ [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]
[Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.]
+[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
[Create new account]
[Editing account]
[Upgrading account]
@@ -13789,20 +13790,12 @@ [User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
;file \plugins\Quotes\src\QuotesProviderBase.cpp
-[No resource name given.]
-[Icon indices start at 1.]
-[Cou件ၬ 耀࡙t find the requested icon.]
-[Application launching is disabled.]
-[Unterminated option.]
-[No argument given to msg option.]
-[Id is required for replacement.]
-[Invalid argument for replace option: ]
-[Empty message ignored.]
-[Failed to write to log file.]
-[Failed to open log file.]
-[N/A: Failed to format error message]
-[N/A: FormatMessage failed, error code was 0x]
-[Error]
+[Log Files (*.txt,*.log)]
+[Enter integer value]
+[Enter log file name.]
+[Enter log file format.]
+[Enter history format.]
+[Enter popup window format.]
;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
@@ -13832,12 +13825,6 @@ [Previous Close]
[Change]
;file \plugins\Quotes\src\SettingsDlg.cpp
-[Log Files (*.txt,*.log)]
-[Enter integer value]
-[Enter log file name.]
-[Enter log file format.]
-[Enter history format.]
-[Enter popup window format.]
#muuid {45230488-977b-405b-856d-ea276d7083b7}
;============================================================
; File: Rate.dll
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index bf66c70d96..6478a658c8 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -121,20 +121,12 @@ [User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
;file \plugins\Quotes\src\QuotesProviderBase.cpp
-[No resource name given.]
-[Icon indices start at 1.]
-[Cou件ၬ 耀࡙t find the requested icon.]
-[Application launching is disabled.]
-[Unterminated option.]
-[No argument given to msg option.]
-[Id is required for replacement.]
-[Invalid argument for replace option: ]
-[Empty message ignored.]
-[Failed to write to log file.]
-[Failed to open log file.]
-[N/A: Failed to format error message]
-[N/A: FormatMessage failed, error code was 0x]
-[Error]
+[Log Files (*.txt,*.log)]
+[Enter integer value]
+[Enter log file name.]
+[Enter log file format.]
+[Enter history format.]
+[Enter popup window format.]
;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
@@ -164,9 +156,3 @@ [Previous Close]
[Change]
;file \plugins\Quotes\src\SettingsDlg.cpp
-[Log Files (*.txt,*.log)]
-[Enter integer value]
-[Enter log file name.]
-[Enter log file format.]
-[Enter history format.]
-[Enter popup window format.]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index f2565ec405..b9ae6e0713 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -2107,7 +2107,7 @@ Miranda пытается обновить вашу структуру хране ВНИМАНИЕ! Учётная запись будет удалена. Это означает, что все настройки, контакты и история также будут удалены.\n\nВы точно уверены?
[Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
Ваша учётная запись успешно обновлена. Для её активации необходимо перезапустить Miranda\n\n\Для перезапуска нажмите "Да", если хотите обновить другую учётную запись, нажмите "Нет"
-[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change it's preferences.]
+[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.]
Эта учётная запись использует старый протокол. Смена личных данных пользователя производится через основные настройки.
[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
Добро пожаловать в менеджер учётных записей Miranda NG!\nЗдесь вы можете настроить свои учётные записи.\n\nСлева в списке можно выбрать учётную запись, или кликнуть на значок плюса снизу для добавления новой учётной записи.
diff --git a/langpacks/russian/Plugins/AuthState.txt b/langpacks/russian/Plugins/AuthState.txt index 26ab5a274a..9656b28424 100644 --- a/langpacks/russian/Plugins/AuthState.txt +++ b/langpacks/russian/Plugins/AuthState.txt @@ -7,7 +7,7 @@ ; Source: http://miranda-plugins.googlecode.com/svn/trunk/authstate/
; Authors: Thief
;============================================================
-[If contact didn't authorized you this plugin puts an icon in front of contacts name.]
+[If a contact didn't authorize you this plugin puts an icon in front of the contact's name.]
Этот плагин поместит значок напротив имени, если контакт не авторизовал вас, или вы не авторизовали его.
[Auth State]
Состояние авторизации
diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt index b81c8e05fa..519e1f7d56 100644 --- a/langpacks/russian/Plugins/Clist_modern.txt +++ b/langpacks/russian/Plugins/Clist_modern.txt @@ -9,7 +9,7 @@ ;============================================================
; Описание плагина
-[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation.]
+[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enhanced metacontact cooperation.]
Показывает контакты, события, статусы протоколов с расширенными функциями оформления (скины). Мультиоконная модификация, расширенная поддержка метаконтактов.
[Modern contact list]
Список контактов Modern
diff --git a/langpacks/russian/Plugins/HistoryPP.txt b/langpacks/russian/Plugins/HistoryPP.txt index 413cf293a8..87070c0fd1 100644 --- a/langpacks/russian/Plugins/HistoryPP.txt +++ b/langpacks/russian/Plugins/HistoryPP.txt @@ -593,7 +593,7 @@ HTML файл Также удалить историю субконтактов
[History of this contact is password protected]
История этого контакта защищена паролем
-[Prevous message]
+[Previous message]
Предыдущее сообщение
[Running version of AniSmiley is not supported]
Эта версия AniSmiley не поддерживается
diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt index 49ee500a6b..45ec0b3bb6 100644 --- a/langpacks/russian/Plugins/MRA.txt +++ b/langpacks/russian/Plugins/MRA.txt @@ -232,9 +232,9 @@ MraFilesQueueConnectionReceived: входящее подключение при Показывать принятый форматированный текст
[Send formatted text (send RTF)]
Отправлять Форматированный текст
-[Anti spam]
+[Anti-spam]
Антиспам
-[Enable Anti Spam]
+[Enable anti-spam]
Включить антиспам
[Check temp contacts]
Проверять временные контакты из списка
diff --git a/langpacks/russian/Plugins/PManagerEx.txt b/langpacks/russian/Plugins/PManagerEx.txt index bf4cc1a785..e4bb159aa0 100644 --- a/langpacks/russian/Plugins/PManagerEx.txt +++ b/langpacks/russian/Plugins/PManagerEx.txt @@ -7,7 +7,7 @@ ;============================================================
[Closes Miranda NG and starts Profile Manager]
Закрывает Miranda NG и запускает менеджер профилей
-[Adds a menu item to change or load a different profile of Miranda NG, restart or run a dbchecker.]
+[Adds a menu item to change or load a different profile of Miranda NG, restart or run DbChecker.]
Добавляет пункты меню, для смены или загрузки другого профиля Miranda NG, перезагрузки и проверки базы.
[&Change Profile...]
&Сменить профиль...
diff --git a/langpacks/russian/Plugins/StopSpam.txt b/langpacks/russian/Plugins/StopSpam.txt index 35ab4cd8f2..afeb5b1d99 100644 --- a/langpacks/russian/Plugins/StopSpam.txt +++ b/langpacks/russian/Plugins/StopSpam.txt @@ -5,7 +5,7 @@ ; Version: 0.0.1.4
; Authors: Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
;============================================================
-[Antispam plugin for Miranda NG.]
+[Anti-spam plugin for Miranda NG.]
Антиспам плагин для Miranda NG.
[Question: (Ctrl-Enter for carriage return)]
Вопрос: (Ctrl+Enter для начала новой строки)
diff --git a/langpacks/russian/Plugins/StopSpamMod.txt b/langpacks/russian/Plugins/StopSpamMod.txt index 4aa5ef1b1b..4066fb9980 100644 --- a/langpacks/russian/Plugins/StopSpamMod.txt +++ b/langpacks/russian/Plugins/StopSpamMod.txt @@ -5,7 +5,7 @@ ; Version: 0.0.2.0
; Authors: Roman Miklashevsky, sss, Elzor
;============================================================
-[Antispam plugin for Miranda NG.]
+[Anti-spam plugin for Miranda NG.]
Антиспам плагин для Miranda NG.
[Question: (Ctrl-Enter for carriage return)]
Вопрос: (Ctrl+Enter для начала новой строки)
diff --git a/langpacks/russian/Plugins/wbOSD.txt b/langpacks/russian/Plugins/wbOSD.txt index 947b7b1aaf..d111b86fde 100644 --- a/langpacks/russian/Plugins/wbOSD.txt +++ b/langpacks/russian/Plugins/wbOSD.txt @@ -1,11 +1,11 @@ #muuid {fc718bc7-abc8-43cd-aad9-761614617738}
;============================================================
; File: wbOSD.dll
-; Module: Shows new message/status change info using onscreen display.
+; Module: Shows new message/status change info using on-screen display.
; Versions: 0.2.1.0
; Authors: Andrej Krutak
;============================================================
-[Shows new message/status change info using onscreen display.]
+[Shows new message/status change info using on-screen display.]
Отображает новые сообщения/изменения статуса, используя OSD.
[Align]
Положение
diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index b4e037d8da..9ae635a6c6 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.cpp @@ -47,8 +47,8 @@ TranslateT("This account uses legacy protocol plugin. \ Use Miranda NG options dialogs to change its preferences.")
#define welcomeMsg \
-TranslateT("Welcome to Miranda NG's account manager!\n\
-Here you can set up your IM accounts.\n\n\
+TranslateT("Welcome to Miranda NG's account manager!\n \
+Here you can set up your IM accounts.\n\n \
Select an account from the list on the left to see the available options. \
Alternatively, just click on the Plus sign underneath the list to set up a new IM account.")
|