summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-07-18 13:17:24 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-07-18 13:17:24 +0000
commit0a4b73656052f1baab97824102f1a088cb1e890c (patch)
tree3eb5b26c83b1ae10b2b43894fea8ea5b9a102c8c
parentd21e85d24b51b31cd1ad0140e8c59c4f4d3b85fd (diff)
- 1 line changed;
- langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@9846 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt2
-rw-r--r--langpacks/english/Plugins/Clist_nicer.txt2
-rw-r--r--langpacks/english/Plugins/Dbx_mmap.txt2
-rw-r--r--langpacks/english/Plugins/Facebook.txt6
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt2
-rw-r--r--langpacks/russian/Plugins/Clist_nicer.txt2
-rw-r--r--langpacks/russian/Plugins/Dbx_mmap.txt4
-rw-r--r--langpacks/russian/Plugins/Facebook.txt12
-rw-r--r--langpacks/russian/Plugins/TabSRMM.txt2
-rw-r--r--plugins/Db3x_mmap/src/dbintf.cpp2
10 files changed, 18 insertions, 18 deletions
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 9a7880adf6..be401c4293 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -136,7 +136,7 @@
[Snap to edges]
[Event notify area]
[Disabled]
-[Show automaticaly]
+[Show automatically]
[Always visible]
[Dock to sides]
[and minimum]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 556d006eb7..0b321453b4 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Clist_nicer.dll
; Plugin: Clist nicer
-; Version: 0.9.2.3
+; Version: 0.9.2.4
; Authors: Pixel, egoDust, cyreve, Nightwish
;============================================================
[Displays contacts, event notifications, protocol status.]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 82fd83c86a..0c225f4d27 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -32,7 +32,7 @@
[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, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
+[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]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 2c9ea8e97f..5cd1ef7d92 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -16,14 +16,14 @@
[Text:]
[URL:]
[Place:]
-[Share]
-[Cancel]
[Contacts >>]
[Attach contacts:]
+[Share]
+[Cancel]
[User details]
+[Contacts Settings]
[Default group:]
[Automatically set 'Ignore status change' flag]
-[Contacts Settings]
[Use bigger avatars]
[Event notifications]
[Notifications]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index e15a46c913..55f598ebd0 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.3.1.4
+; Version: 3.3.1.5
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
diff --git a/langpacks/russian/Plugins/Clist_nicer.txt b/langpacks/russian/Plugins/Clist_nicer.txt
index 7a1160296a..2ae92195d4 100644
--- a/langpacks/russian/Plugins/Clist_nicer.txt
+++ b/langpacks/russian/Plugins/Clist_nicer.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Clist_nicer.dll
; Plugin: Clist nicer
-; Version: 0.9.2.3
+; Version: 0.9.2.4
; Authors: Pixel, egoDust, cyreve, Nightwish
;============================================================
[Displays contacts, event notifications, protocol status.]
diff --git a/langpacks/russian/Plugins/Dbx_mmap.txt b/langpacks/russian/Plugins/Dbx_mmap.txt
index cd13c7ac75..d8717fa33f 100644
--- a/langpacks/russian/Plugins/Dbx_mmap.txt
+++ b/langpacks/russian/Plugins/Dbx_mmap.txt
@@ -51,8 +51,8 @@ Miranda нашла повреждения в вашей базе. Они мог
Формат вашего профиля является устаревшим. Чтобы получать обновления через PluginUpdater, необходимо преобразовать профиль в современный формат.\n\nНажмите Да, чтобы получить информацию, как это исправить.
[Obsolete database format]
Устаревший формат профиля
-[Your database must be converted into the new format. This is potentially dangerous operation, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda]
-Ваш профиль будет конвертирован в новый формат. Это потенциально опасное действие, сделайте, пожалуйста, резервную копию профиля.\n\nНажмите 'Да', чтобы начать конвертирование, или 'Нет', чтобы выйти из программы.
+[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]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index d4ca167dea..242727aef0 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -23,22 +23,22 @@
Текст:
[Place:]
Место:
-[Share]
-Отправить
-[Cancel]
-Отмена
[Contacts >>]
Контакты >>
[Attach contacts:]
Присоединить контакты:
+[Share]
+Отправить
+[Cancel]
+Отмена
[User details]
О пользователе
+[Contacts Settings]
+Настройки контактов
[Default group:]
Группа:
[Automatically set 'Ignore status change' flag]
Автоматически включать игнорирование смены статусов
-[Contacts Settings]
-Настройки контактов
[Use bigger avatars]
Большие аватары
[Event notifications]
diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index bf807d3d42..2593ee2fee 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
;============================================================
; File: TabSRMM.dll
; Plugin: TabSRMM
-; Version: 3.3.1.4
+; Version: 3.3.1.5
; Authors: The Miranda developers team and contributors
;============================================================
[IM and group chat module for Miranda NG.]
diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp
index d256adefe1..28107e7cee 100644
--- a/plugins/Db3x_mmap/src/dbintf.cpp
+++ b/plugins/Db3x_mmap/src/dbintf.cpp
@@ -117,7 +117,7 @@ CDb3Mmap::~CDb3Mmap()
}
static TCHAR szMsgConvert[] =
- LPGENT("Your database must be converted into the new format. This is potentially dangerous operation, so please make a backup before.\n\nClick Yes to proceed with conversion or No to exit Miranda");
+ LPGENT("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");
int CDb3Mmap::Load(bool bSkipInit)
{