summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-07-21 08:16:23 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-07-21 08:16:23 +0000
commit6a894315ed986fe11ccbaf97fb15bbbe172c085d (patch)
tree01e0bbfc0959abb9f9a9bc1016aa3c835b7054ac
parent22956dbd60e52103afcfa87c93776c46a8c9947f (diff)
translation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@9897 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/=CORE=.txt1
-rw-r--r--langpacks/english/Plugins/Dbx_mmap.txt3
-rw-r--r--langpacks/english/Plugins/FavContacts.txt2
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/russian/=CORE=.txt2
-rw-r--r--langpacks/russian/Plugins/Dbx_mmap.txt4
-rw-r--r--langpacks/russian/Plugins/FavContacts.txt2
-rw-r--r--langpacks/russian/Plugins/PluginUpdater.txt2
-rw-r--r--src/modules/metacontacts/meta_main.cpp2
9 files changed, 8 insertions, 12 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index ab065748d5..5baf29b4e4 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1246,6 +1246,7 @@
[Add to existing]
[Edit]
[Set to default]
+[MetaContacts]
;file \src\modules\metacontacts\meta_menu.cpp
[There was a problem in assigning the contact to the metacontact]
[This will remove the metacontact permanently.\n\nProceed anyway?]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index a47ac33368..d00e56b74b 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -31,9 +31,6 @@
;file \plugins\Db3x_mmap\src\dbheaders.cpp
[This profile is too old to be updated with PluginUpdater, your database must be converted first.\n\nWould you like to read how to fix this?]
[Obsolete database format]
-;file \plugins\Db3x_mmap\src\dbintf.cpp
-[Your database must be converted into the new format. This is potentially dangerous operation and might damage your profile, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
-[Database conversion required]
;file \plugins\Db3x_mmap\src\dbintf.h
[Change/remove password]
;file \plugins\Db3x_mmap\src\ui.cpp
diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt
index a576e180e2..149653ca3f 100644
--- a/langpacks/english/Plugins/FavContacts.txt
+++ b/langpacks/english/Plugins/FavContacts.txt
@@ -2,7 +2,7 @@
;============================================================
; File: FavContacts.dll
; Plugin: Favorite contacts
-; Version: 0.1.0.2
+; Version: 0.1.0.3
; Authors: Victor Pavlychko
;============================================================
[Favorite contacts menu.]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 31d123834b..e97969b3c3 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.1
+; Version: 0.1.2.2
; Authors: Mataes, George Hazan
;============================================================
[Plugin updater for Miranda NG.]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 2cb0d0b923..f97b2e10e6 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2313,6 +2313,8 @@ Miranda NG не может открыть этот профиль
Изменить
[Set to default]
По умолчанию
+[MetaContacts]
+Метаконтакты
[There was a problem in assigning the contact to the metacontact]
Обнаружена проблема добавления контакта к метаконтакту
[This will remove the metacontact permanently.\n\nProceed anyway?]
diff --git a/langpacks/russian/Plugins/Dbx_mmap.txt b/langpacks/russian/Plugins/Dbx_mmap.txt
index 79abfd4bef..d581970e6b 100644
--- a/langpacks/russian/Plugins/Dbx_mmap.txt
+++ b/langpacks/russian/Plugins/Dbx_mmap.txt
@@ -51,10 +51,6 @@ Miranda нашла повреждения в вашей базе. Они мог
Формат вашего профиля является устаревшим. Чтобы получать обновления через PluginUpdater, необходимо преобразовать профиль в современный формат.\n\nНажмите Да, чтобы получить информацию, как это исправить.
[Obsolete database format]
Устаревший формат профиля
-[Your database must be converted into the new format. This is potentially dangerous operation and might damage your profile, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
-Ваш профиль будет конвертирован в новый формат. Это потенциально опасное действие, которое может привести к потере истории переписки или неработоспособному профилю, сделайте, пожалуйста, резервную копию профиля.\n\nНажмите 'Да', чтобы начать конвертирование, или 'Нет', чтобы выйти из программы.
-[Database conversion required]
-Конвертирование базы
[Change/remove password]
Изменить/удалить пароль
[Logo]
diff --git a/langpacks/russian/Plugins/FavContacts.txt b/langpacks/russian/Plugins/FavContacts.txt
index 6b3f87fda5..3372550d80 100644
--- a/langpacks/russian/Plugins/FavContacts.txt
+++ b/langpacks/russian/Plugins/FavContacts.txt
@@ -2,7 +2,7 @@
;============================================================
; File: FavContacts.dll
; Plugin: Favorite contacts
-; Version: 0.1.0.2
+; Version: 0.1.0.3
; Authors: Victor Pavlychko
;============================================================
[Favorite contacts menu.]
diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt
index 4d6afe9584..3b0c205972 100644
--- a/langpacks/russian/Plugins/PluginUpdater.txt
+++ b/langpacks/russian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
;============================================================
; File: PluginUpdater.dll
; Plugin: Plugin updater
-; Version: 0.1.2.1
+; Version: 0.1.2.2
; Authors: Mataes, George Hazan
;============================================================
[Plugin updater for Miranda NG.]
diff --git a/src/modules/metacontacts/meta_main.cpp b/src/modules/metacontacts/meta_main.cpp
index e78a7ec6bd..74f8c48551 100644
--- a/src/modules/metacontacts/meta_main.cpp
+++ b/src/modules/metacontacts/meta_main.cpp
@@ -56,7 +56,7 @@ void UnloadMetacontacts(void)
// Called when the plugin is loaded into Miranda
int LoadMetacontacts(void)
{
- Icon_Register(hInst, META_PROTO, iconList, SIZEOF(iconList), "mc");
+ Icon_Register(hInst, LPGEN("MetaContacts"), iconList, SIZEOF(iconList), "mc");
db_set_resident(META_PROTO, "Status");
db_set_resident(META_PROTO, "IdleTS");