summaryrefslogtreecommitdiff
path: root/langpacks
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-10-19 08:23:48 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-10-19 08:23:48 +0000
commitb6e113816c9fc94acbfb09367652c2f460e14f70 (patch)
tree42e4936a1ced8f6e69573acc61795543b4514f99 /langpacks
parentcb6403a3b95c9958d67aaef905fdaa8618bf1ac4 (diff)
- langpacks/english: update;
- langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@10829 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks')
-rw-r--r--langpacks/english/Plugins/Db_autobackups.txt4
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/english/Plugins/Scriver.txt4
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt4
-rw-r--r--langpacks/english/Plugins/Variables.txt8
-rw-r--r--langpacks/russian/Plugins/Db_autobackups.txt8
-rw-r--r--langpacks/russian/Plugins/PluginUpdater.txt4
-rw-r--r--langpacks/russian/Plugins/Scriver.txt8
-rw-r--r--langpacks/russian/Plugins/TabSRMM.txt8
-rw-r--r--langpacks/russian/Plugins/Variables.txt16
10 files changed, 33 insertions, 33 deletions
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index a23a185055..c8f83c7434 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -39,9 +39,9 @@
[Database]
;file \plugins\Db_autobackups\src\options.cpp
[path to Miranda root folder]
-[path to current Miranda profile]
+[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
["My Documents" folder for currently logged-on Windows user]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 382d5dd9fd..5a2b80bb1a 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -78,6 +78,7 @@
[%d component(s) was updated]
[You need to restart your Miranda to apply installed updates.]
[Would you like to restart it now?]
+[Checking for new updates...]
[No updates found.]
[Update checking already started!]
;file \plugins\PluginUpdater\src\Events.cpp
@@ -99,5 +100,4 @@
[Plugin info]
[Plugin list]
[Plugin Updater HTTP connection]
-[Checking for new updates...]
[An error occurred while checking for new updates.]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 3709924fa6..f9e335c264 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -403,9 +403,9 @@
[user-defined account name of current contact (if defined).]
[user ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
[path to Miranda root folder]
-[path to current Miranda profile]
+[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
[will return parsed string %miranda_userdata%\\Logs]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index fe7d07d412..b07b3d4760 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1069,9 +1069,9 @@
[user-defined account name of current contact (if defined).]
[user ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
[path to Miranda root folder]
-[path to current Miranda profile]
+[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
[will return parsed string %miranda_userdata%\\Logs]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 8ec474c42e..bed883373e 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -93,11 +93,11 @@
;file \plugins\Variables\src\parse_miranda.cpp
[Miranda Core Global]
[path to Miranda root folder]
-[path to current Miranda profile]
+[path to folder containing Miranda profiles]
[name of current Miranda profile (filename, without extension)]
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\AvatarCache]
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\Logs]
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
+[will return parsed string %miranda_profile%\\%miranda_profilename%\\AvatarCache]
+[will return parsed string %miranda_profile%\%miranda_profilename%\\Logs]
[Miranda Core OS]
[same as environment variable %APPDATA% for currently logged-on Windows user]
[username for currently logged-on Windows user]
diff --git a/langpacks/russian/Plugins/Db_autobackups.txt b/langpacks/russian/Plugins/Db_autobackups.txt
index 90e90298b2..16aa8c3e65 100644
--- a/langpacks/russian/Plugins/Db_autobackups.txt
+++ b/langpacks/russian/Plugins/Db_autobackups.txt
@@ -65,12 +65,12 @@
Профиль
[path to Miranda root folder]
путь к папке программы
-[path to current Miranda profile]
-путь к папке текущего профиля
+[path to folder containing Miranda profiles]
+путь к папке, срдержащей профили программы
[name of current Miranda profile (filename, without extension)]
имя текущего профиля (только имя, без расширения)
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-возвратит строку вида %miranda_profile%\\Profiles\\%miranda_profilename%
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
+возвратит строку вида %miranda_profile%\\%miranda_profilename%
[same as environment variable %APPDATA% for currently logged-on Windows user]
аналог переменной среды %APPDATA% для текущего пользователя системы
[username for currently logged-on Windows user]
diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt
index 491b9c22bd..6eb02e2881 100644
--- a/langpacks/russian/Plugins/PluginUpdater.txt
+++ b/langpacks/russian/Plugins/PluginUpdater.txt
@@ -145,6 +145,8 @@
Применение обновлений произойдёт после перезапуска программы.
[Would you like to restart it now?]
Перезагрузить программу сейчас?
+[Checking for new updates...]
+Проверка обновлений...
[No updates found.]
Обновлений нет.
[Update checking already started!]
@@ -175,7 +177,5 @@
Список плагинов
[Plugin Updater HTTP connection]
HTTP подключение Plugin Updater
-[Checking for new updates...]
-Проверка обновлений...
[An error occurred while checking for new updates.]
Во время проверки обновления произошла ошибка.
diff --git a/langpacks/russian/Plugins/Scriver.txt b/langpacks/russian/Plugins/Scriver.txt
index 8fe41410a8..4b03d5f68e 100644
--- a/langpacks/russian/Plugins/Scriver.txt
+++ b/langpacks/russian/Plugins/Scriver.txt
@@ -753,12 +753,12 @@
ID текущего контакта (если определен). Например, UIN для ICQ, JID для Jabber и т.д.
[path to Miranda root folder]
путь к папке программы
-[path to current Miranda profile]
-путь к папке текущего профиля
+[path to folder containing Miranda profiles]
+путь к папке, срдержащей профили программы
[name of current Miranda profile (filename, without extension)]
имя текущего профиля (только имя, без расширения)
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-возвратит строку вида %miranda_profile%\\Profiles\\%miranda_profilename%
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
+возвратит строку вида %miranda_profile%\\%miranda_profilename%
[will return parsed string %miranda_userdata%\\Logs]
возвратит строку вида %miranda_userdata%\\Logs
[same as environment variable %APPDATA% for currently logged-on Windows user]
diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index d566f6da71..887d145185 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -2055,12 +2055,12 @@ IRC-стиль (текстовый) индикаторов ролей в жур
ID текущего контакта (если определен). Например, UIN для ICQ, JID для Jabber и т.д.
[path to Miranda root folder]
путь к папке программы
-[path to current Miranda profile]
-путь к папке текущего профиля
+[path to folder containing Miranda profiles]
+путь к папке, срдержащей профили программы
[name of current Miranda profile (filename, without extension)]
имя текущего профиля (только имя, без расширения)
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-возвратит строку вида %miranda_profile%\\Profiles\\%miranda_profilename%
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
+возвратит строку вида %miranda_profile%\\%miranda_profilename%
[will return parsed string %miranda_userdata%\\Logs]
возвратит строку вида %miranda_userdata%\\Logs
[same as environment variable %APPDATA% for currently logged-on Windows user]
diff --git a/langpacks/russian/Plugins/Variables.txt b/langpacks/russian/Plugins/Variables.txt
index a8e78566cc..dd75c7407e 100644
--- a/langpacks/russian/Plugins/Variables.txt
+++ b/langpacks/russian/Plugins/Variables.txt
@@ -157,16 +157,16 @@ x умноженное на y делённое на z
Переменные ядра Miranda
[path to Miranda root folder]
путь к папке программы
-[path to current Miranda profile]
-путь к папке текущего профиля
+[path to folder containing Miranda profiles]
+путь к папке, срдержащей профили программы
[name of current Miranda profile (filename, without extension)]
имя текущего профиля (только имя, без расширения)
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-возвратит строку вида %miranda_profile%\\Profiles\\%miranda_profilename%
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\AvatarCache]
-возвращает путь %miranda_profile%\\Profiles\\%miranda_profilename%\\AvatarCache
-[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\Logs]
-возвращает путь %miranda_profile%\\Profiles\\%miranda_profilename%\\Logs
+[will return parsed string %miranda_profile%\\%miranda_profilename%]
+возвратит строку вида %miranda_profile%\\%miranda_profilename%
+[will return parsed string %miranda_profile%\\%miranda_profilename%\\AvatarCache]
+возвращает путь %miranda_profile%\\%miranda_profilename%\\AvatarCache
+[will return parsed string %miranda_profile%\%miranda_profilename%\\Logs]
+возвращает путь %miranda_profile%\\%miranda_profilename%\\Logs
[Miranda Core OS]
Переменные окружения в Miranda
[same as environment variable %APPDATA% for currently logged-on Windows user]