summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--langpacks/english/Plugins/AIM.txt2
-rw-r--r--langpacks/english/Plugins/AdvancedAutoAway.txt17
-rw-r--r--langpacks/english/Plugins/CmdLine.txt2
-rw-r--r--langpacks/english/Plugins/Folders.txt4
-rw-r--r--langpacks/english/Plugins/KeepStatus.txt15
-rw-r--r--langpacks/english/Plugins/MSN.txt6
-rw-r--r--langpacks/english/Plugins/NewXstatusNotify.txt1
-rw-r--r--langpacks/english/Plugins/StartupStatus.txt15
-rw-r--r--langpacks/english/Plugins/Twitter.txt6
-rw-r--r--langpacks/english/Plugins/UInfoEx.txt2
-rw-r--r--langpacks/russian/Plugins/AdvancedAutoAway.txt32
-rw-r--r--langpacks/russian/Plugins/KeepStatus.txt30
-rw-r--r--langpacks/russian/Plugins/NewXstatusNotify.txt2
-rw-r--r--langpacks/russian/Plugins/StartupStatus.txt30
-rw-r--r--langpacks/russian/Plugins/Twitter.txt6
-rw-r--r--langpacks/russian/Plugins/_Various.txt2
-rw-r--r--langpacks/russian/Untranslated/UInfoEx.txt2
17 files changed, 92 insertions, 82 deletions
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 356c310a2d..697dd4d997 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -153,7 +153,7 @@
[%s Client-to-client connection]
;file \protocols\AimOscar\src\server.cpp
[[Auto-Response]:]
-[Contact tried to open an audio/video conference (currently not supported)]
+[Contact tried to open an audio/video conference (not currently supported)]
[No information has been provided by the server.]
[Item you want to delete not found in list.]
[Failed to add buddy to list: Item already exist.]
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 2e65f0dd8a..089288b414 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -2,7 +2,7 @@
;============================================================
; File: AdvancedAutoAway.dll
; Plugin: Advanced Auto Away
-; Version: 0.8.0.42
+; Version: 0.8.1.0
; Authors: P Boon
;============================================================
[An Auto Away module with some more options than the original.]
@@ -23,18 +23,19 @@
[Cancel]
[Profile]
[Message]
+[Account]
+[Set]
+[when full-screen mode is active]
+[when screen saver engages]
+[when workstation is locked]
[after]
[minutes of inactivity]
[minutes of level 1 mode]
-[Confirm resetting status]
-[Account]
-[Only set if current status is]
+[only set when inactive]
[Monitor Miranda's activity only]
[Reset status on return]
-[when screen saver engages]
-[Set]
-[only set when inactive]
-[when workstation is locked]
+[Confirm resetting status]
+[Only set if current status is]
[Command line]
[OK]
[Copy to clipboard]
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index e8c765ebd7..5b6b634291 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -37,7 +37,7 @@
[Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n<Setting> is one of the following settings:\n status (disable | enable | toggle)\n server <proxy type> <server> <port>.]
[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.]
[Shows history or unread messages for a contact.\nUsage: history <command> <contact>.\n<Command> is one of the following commands:\n unread - show unread messages for that contact.\n show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).]
-[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]
+[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]
[Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]
[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts]
;file \plugins\CmdLine\src\mimcmd_handlers.cpp
diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index 107f82de35..8c8f18fb15 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -26,7 +26,7 @@
[Expands to your profile path - the value found in mirandaboot.ini,]
[ProfileDir section (usually inside Miranda's folder).]
[Expands to your current profile name without the extenstion.]
-[(e.g.default if your your profile is default.dat).]
+[(e.g. default if your your profile is default.dat).]
[Environment variables]
[The plugin can also expand environment variables; the variables are specified like in any other]
[program that can use environment variables, i.e. %<env variable>%.]
@@ -35,7 +35,7 @@
[instead of expanding to Miranda's profile path.]
[Examples:]
[If the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is '.\\profiles\', current]
-[profile is 'default.dat' and Miranda's path is 'c:\\program files\\miranda ng\' then:]
+[profile is 'default.dat' and Miranda path is 'c:\\program files\\miranda ng\' then:]
[will expand to 'c:\\program files\\miranda ng']
[will expand to 'c:\\program files\\miranda ng\\profiles']
[will expand to 'default']
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index a39f0f3f52..fc25f740d5 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -23,18 +23,19 @@
[Cancel]
[Profile]
[Message]
+[Account]
+[Set]
+[when full-screen mode is active]
+[when screen saver engages]
+[when workstation is locked]
[after]
[minutes of inactivity]
[minutes of level 1 mode]
-[Confirm resetting status]
-[Account]
-[Only set if current status is]
+[only set when inactive]
[Monitor Miranda's activity only]
[Reset status on return]
-[when screen saver engages]
-[Set]
-[only set when inactive]
-[when workstation is locked]
+[Confirm resetting status]
+[Only set if current status is]
[Command line]
[OK]
[Copy to clipboard]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index d9fb6a882d..332143c826 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -70,7 +70,7 @@
[User &details]
[User &history]
;file \protocols\MSN\src\msn_commands.cpp
-[Contact tried to open an audio conference (currently not supported)]
+[Contact tried to open an audio conference (not currently supported)]
[%I64u bytes]
[Accept NetMeeting request from %s?]
[MSN Protocol]
@@ -139,8 +139,8 @@
[Server list]
[Notifications]
;file \protocols\MSN\src\msn_p2p.cpp
-[Contact tried to send its webcam data (currently not supported)]
-[Contact tried to view our webcam data (currently not supported)]
+[Contact tried to send its webcam data (not currently supported)]
+[Contact tried to view our webcam data (not currently supported)]
;file \protocols\MSN\src\msn_proto.cpp
[Live Mail]
[Live Alert]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index ddf182abdc..047c3c62bb 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -173,6 +173,7 @@
[Filtering]
[Message log]
;file \plugins\NewXstatusNotify\src\popup.h
+[(was %s)]
[Open message window]
[Close popup]
[Open contact details window]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index cd9ad71934..cf3c0127d5 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -23,18 +23,19 @@
[Cancel]
[Profile]
[Message]
+[Account]
+[Set]
+[when full-screen mode is active]
+[when screen saver engages]
+[when workstation is locked]
[after]
[minutes of inactivity]
[minutes of level 1 mode]
-[Confirm resetting status]
-[Account]
-[Only set if current status is]
+[only set when inactive]
[Monitor Miranda's activity only]
[Reset status on return]
-[when screen saver engages]
-[Set]
-[only set when inactive]
-[when workstation is locked]
+[Confirm resetting status]
+[Only set if current status is]
[Command line]
[OK]
[Copy to clipboard]
diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index c7dd9ff6e8..ff120d2b2d 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -11,11 +11,11 @@
[Create a new Twitter account]
[Default group:]
[Username:]
-[[Sign in to link your Twitter account]]
+[<Sign in to link your Twitter account>]
[Send Tweet]
[Send]
[Cancel]
-[Misc. Options]
+[Miscellaneous options]
[Use group chat for Twitter feed]
[Base URL:]
[Polling rate:]
@@ -23,7 +23,7 @@
[sec]
[Please cycle your connection for these changes to take effect]
[Treat tweets as messages]
-[Enable popup notifications for Tweets]
+[Enable popup notifications for tweets]
[Colors]
[Use Windows colors]
[Use Popup colors]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index fcd084e485..d951627303 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -230,7 +230,7 @@
[Retry]
[Yes]
[No]
-[Abord]
+[Abort]
[Ignore]
[Error]
;file \plugins\UserInfoEx\src\dlg_propsheet.cpp
diff --git a/langpacks/russian/Plugins/AdvancedAutoAway.txt b/langpacks/russian/Plugins/AdvancedAutoAway.txt
index 35a4019803..7cc7f9928f 100644
--- a/langpacks/russian/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/russian/Plugins/AdvancedAutoAway.txt
@@ -2,7 +2,7 @@
;============================================================
; File: AdvancedAutoAway.dll
; Plugin: Advanced Auto Away
-; Version: 0.8.0.42
+; Version: 0.8.1.0
; Authors: P Boon
;============================================================
[An Auto Away module with some more options than the original.]
@@ -39,30 +39,32 @@
Профиль
[Message]
Сообщение
+[Account]
+Учётная запись
+[Set]
+Выбрать
+[when full-screen mode is active]
+в полноэкранном режиме
+[when screen saver engages]
+при запуске заставки
+[when workstation is locked]
+при блокировке компьютера
[after]
через
[minutes of inactivity]
минут неактивности
[minutes of level 1 mode]
минут режима 1
-[Confirm resetting status]
-Подтвердить сброс статуса
-[Account]
-Учётная запись
-[Only set if current status is]
-Только если статус:
+[only set when inactive]
+только при неактивности
[Monitor Miranda's activity only]
Следить только за Miranda
[Reset status on return]
Восстановить статус при возвращении
-[when screen saver engages]
-при запуске заставки
-[Set]
-Выбрать
-[only set when inactive]
-только при неактивности
-[when workstation is locked]
-при блокировке компьютера
+[Confirm resetting status]
+Подтвердить сброс статуса
+[Only set if current status is]
+Только если статус:
[Command line]
Ком. строка
[Copy to clipboard]
diff --git a/langpacks/russian/Plugins/KeepStatus.txt b/langpacks/russian/Plugins/KeepStatus.txt
index c82ad61df7..568932792c 100644
--- a/langpacks/russian/Plugins/KeepStatus.txt
+++ b/langpacks/russian/Plugins/KeepStatus.txt
@@ -39,30 +39,32 @@
Профиль
[Message]
Сообщение
+[Account]
+Учётная запись
+[Set]
+Выбрать
+[when full-screen mode is active]
+в полноэкранном режиме
+[when screen saver engages]
+при запуске заставки
+[when workstation is locked]
+при блокировке компьютера
[after]
через
[minutes of inactivity]
минут неактивности
[minutes of level 1 mode]
минут режима 1
-[Confirm resetting status]
-Подтвердить сброс статуса
-[Account]
-Учётная запись
-[Only set if current status is]
-Только если статус:
+[only set when inactive]
+только при неактивности
[Monitor Miranda's activity only]
Следить только за Miranda
[Reset status on return]
Восстановить статус при возвращении
-[when screen saver engages]
-при запуске заставки
-[Set]
-Выбрать
-[only set when inactive]
-только при неактивности
-[when workstation is locked]
-при блокировке компьютера
+[Confirm resetting status]
+Подтвердить сброс статуса
+[Only set if current status is]
+Только если статус:
[Command line]
Ком. строка
[Copy to clipboard]
diff --git a/langpacks/russian/Plugins/NewXstatusNotify.txt b/langpacks/russian/Plugins/NewXstatusNotify.txt
index 465717f729..8dcbed0a10 100644
--- a/langpacks/russian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/russian/Plugins/NewXstatusNotify.txt
@@ -327,6 +327,8 @@ xСтатус удален
Фильтрация
[Message log]
Журнал
+[(was %s)]
+(было %s)
[Open message window]
Открыть окно беседы
[Close popup]
diff --git a/langpacks/russian/Plugins/StartupStatus.txt b/langpacks/russian/Plugins/StartupStatus.txt
index b767ee83a3..b690ff12b1 100644
--- a/langpacks/russian/Plugins/StartupStatus.txt
+++ b/langpacks/russian/Plugins/StartupStatus.txt
@@ -39,30 +39,32 @@
Профиль
[Message]
Сообщение
+[Account]
+Учётная запись
+[Set]
+Выбрать
+[when full-screen mode is active]
+в полноэкранном режиме
+[when screen saver engages]
+при запуске заставки
+[when workstation is locked]
+при блокировке компьютера
[after]
через
[minutes of inactivity]
минут неактивности
[minutes of level 1 mode]
минут режима 1
-[Confirm resetting status]
-Подтвердить сброс статуса
-[Account]
-Учётная запись
-[Only set if current status is]
-Только если статус:
+[only set when inactive]
+только при неактивности
[Monitor Miranda's activity only]
Следить только за Miranda
[Reset status on return]
Восстановить статус при возвращении
-[when screen saver engages]
-при запуске заставки
-[Set]
-Выбрать
-[only set when inactive]
-только при неактивности
-[when workstation is locked]
-при блокировке компьютера
+[Confirm resetting status]
+Подтвердить сброс статуса
+[Only set if current status is]
+Только если статус:
[Command line]
Ком. строка
[Copy to clipboard]
diff --git a/langpacks/russian/Plugins/Twitter.txt b/langpacks/russian/Plugins/Twitter.txt
index 6e315269c9..756bc87759 100644
--- a/langpacks/russian/Plugins/Twitter.txt
+++ b/langpacks/russian/Plugins/Twitter.txt
@@ -23,8 +23,8 @@
Отправить
[Cancel]
Отмена
-[Misc. Options]
-Доп. настройки
+[Miscellaneous options]
+Другие параметры
[Use group chat for Twitter feed]
Чат для отображения сообщений
[Base URL:]
@@ -39,7 +39,7 @@ URL:
Пожалуйста, переподключитесь что бы изменения вступили с силу
[Treat tweets as messages]
Твиты как сообщения
-[Enable popup notifications for Tweets]
+[Enable popup notifications for tweets]
Всплывающие окна для Tweets
[Colors]
Цвета
diff --git a/langpacks/russian/Plugins/_Various.txt b/langpacks/russian/Plugins/_Various.txt
index a6e367f130..05d8198333 100644
--- a/langpacks/russian/Plugins/_Various.txt
+++ b/langpacks/russian/Plugins/_Various.txt
@@ -17,8 +17,6 @@
Показывать значок
[Show avatars]
Показывать аватары
-[(was %s)]
-(было %s)
;==============================================================================
; Various actions and tipper items not included in source code.
;==============================================================================
diff --git a/langpacks/russian/Untranslated/UInfoEx.txt b/langpacks/russian/Untranslated/UInfoEx.txt
index d90f78cde5..63261e160e 100644
--- a/langpacks/russian/Untranslated/UInfoEx.txt
+++ b/langpacks/russian/Untranslated/UInfoEx.txt
@@ -3,7 +3,7 @@
[r]
[Use Zodiac as default avatar]
[A fatal error occurred on adding a property sheet page!\nDialog creation aborted!]
-[Abord]
+[Abort]
[The Page to add has invalid size %d bytes!]
[Fatal error, image services not found. Flags Module will be disabled.]
[Ex-/Import Group]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:40:06 +0000