diff options
author | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-06-21 13:21:03 +0000 |
---|---|---|
committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-06-21 13:21:03 +0000 |
commit | c63997c27473240a1a3c811a762db5611ad3b879 (patch) | |
tree | 6a447629c84cdedc518f621b382c2c1f4f7e72aa /langpacks | |
parent | 54f0075ab28b3f6ba5d769addd7b4a8831dca31a (diff) |
- langpacks/english: update;
- langpacks/russian: update;
git-svn-id: http://svn.miranda-ng.org/main/trunk@14297 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks')
-rw-r--r-- | langpacks/english/=CORE=.txt | 4 | ||||
-rw-r--r-- | langpacks/english/Plugins/ClientChangeNotify.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/DbEditorPP.txt | 6 | ||||
-rw-r--r-- | langpacks/english/Plugins/MyDetails.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/PluginUpdater.txt | 2 | ||||
-rw-r--r-- | langpacks/english/Plugins/SkypeWeb.txt | 1 | ||||
-rw-r--r-- | langpacks/english/Plugins/UInfoEx.txt | 2 | ||||
-rw-r--r-- | langpacks/russian/=CORE=.txt | 4 | ||||
-rw-r--r-- | langpacks/russian/Plugins/ClientChangeNotify.txt | 4 | ||||
-rw-r--r-- | langpacks/russian/Plugins/DbEditorPP.txt | 2 | ||||
-rw-r--r-- | langpacks/russian/Plugins/MyDetails.txt | 2 | ||||
-rw-r--r-- | langpacks/russian/Plugins/PluginUpdater.txt | 2 | ||||
-rw-r--r-- | langpacks/russian/Plugins/UInfoEx.txt | 2 | ||||
-rw-r--r-- | langpacks/russian/Untranslated/DbEditorPP.txt | 5 |
14 files changed, 16 insertions, 24 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index ac60a2d7c0..aa1274b1cf 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1415,8 +1415,6 @@ ;file \src\mir_app\src\sounds.cpp
[Sound files]
[WAV files]
-;file \src\mir_app\src\timezones.cpp
-[<unspecified>]
;file \src\mir_app\src\utils.cpp
[Unspecified]
[Afghanistan]
@@ -1675,3 +1673,5 @@ [JPEG bitmaps]
[GIF bitmaps]
[PNG bitmaps]
+;file \src\mir_core\src\timezones.cpp
+[<unspecified>]
diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt index 8d0448600c..45bbc74284 100644 --- a/langpacks/english/Plugins/ClientChangeNotify.txt +++ b/langpacks/english/Plugins/ClientChangeNotify.txt @@ -29,7 +29,7 @@ [Text]
[Preview]
[Ignore these clients (separated by semicolons):]
-[(you have to install pcre16.dll to use regular expressions here)]
+[(you have to install pcre16.mir to use regular expressions here)]
;file \plugins\ClientChangeNotify\src\ClientChangeNotify.cpp
[changed client to %s (was %s)]
[changed client to %s]
diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt index cd4e25ae6c..9268862f94 100644 --- a/langpacks/english/Plugins/DbEditorPP.txt +++ b/langpacks/english/Plugins/DbEditorPP.txt @@ -110,7 +110,7 @@ [Are you sure you want to delete module "%s"?]
[Delete module from database]
[Delete module from database... Loading]
-[Delete module from all contacts (including Setting)]
+[Delete from all contacts (including Settings)]
;file \plugins\DbEditorPP\src\exportimport.cpp
[INI Files]
[All Files]
@@ -154,8 +154,8 @@ [[UNLOADED]]
;file \plugins\DbEditorPP\src\main_window.cpp
[Are you sure you want to delete contact "%s"?]
-[Fix resident setting deleting them from DB ?]
-[Deleted orphaned items: %d]
+[Delete resident settings from database?]
+[%d orphaned items deleted.]
;file \plugins\DbEditorPP\src\modsettingenum.cpp
[Error loading module list]
[Error loading setting list]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt index e2944e5980..d4b41c5c9e 100644 --- a/langpacks/english/Plugins/MyDetails.txt +++ b/langpacks/english/Plugins/MyDetails.txt @@ -5,7 +5,7 @@ ; Version: 0.0.1.12
; Authors: Ricardo Pescuma Domenecci, Drugwash
;============================================================
-[Shows and allows you to edit your details for all protocols.]
+[Shows and allows you to edit your details for all accounts.]
;file \plugins\MyDetails\res\resource.rc
[Set my nickname]
[Nickname:]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt index d169427717..4a3ffb1fb9 100644 --- a/langpacks/english/Plugins/PluginUpdater.txt +++ b/langpacks/english/Plugins/PluginUpdater.txt @@ -5,7 +5,7 @@ ; Version: 0.1.2.4
; Authors: Mataes, George Hazan
;============================================================
-[Plugin updater for Miranda NG.]
+[Install and update plugins and other Miranda NG components.]
;file \plugins\PluginUpdater\res\Resource.rc
[Updates found!]
[PluginUpdater has detected updated versions of some Miranda components. Click on Details button to view more information.]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt index 1764a92cb2..4ad94b51cc 100644 --- a/langpacks/english/Plugins/SkypeWeb.txt +++ b/langpacks/english/Plugins/SkypeWeb.txt @@ -39,6 +39,7 @@ [Set &role]
[&Admin]
[&User]
+[Enter new chatroom topic]
;file \protocols\SkypeWeb\src\skype_contacts.cpp
[Are you sure?]
;file \protocols\SkypeWeb\src\skype_events.cpp
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index 69099ce092..35d0d05ad2 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -210,8 +210,6 @@ [CRITICAL: Unable to edit current entry!\nThis should not happen!]
[Do you really want to delete the current selected item?\n\t%s\n\t%s]
[Other]
-;file \plugins\UserInfoEx\src\ctrl_tzcombo.cpp
-[<Unspecified>]
;file \plugins\UserInfoEx\src\dlg_anniversarylist.cpp
[ETA]
[Contact]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index d1d0faa167..68db8460d5 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -2577,8 +2577,6 @@ ANSI плагин Звуковые файлы
[WAV files]
Файлы WAV
-[<unspecified>]
-<не указано>
[Unspecified]
Не указано
[Afghanistan]
@@ -3089,3 +3087,5 @@ ANSI плагин Изображения GIF
[PNG bitmaps]
Изображения PNG
+[<unspecified>]
+<не указано>
diff --git a/langpacks/russian/Plugins/ClientChangeNotify.txt b/langpacks/russian/Plugins/ClientChangeNotify.txt index 7e8e2492cb..2ac96715dd 100644 --- a/langpacks/russian/Plugins/ClientChangeNotify.txt +++ b/langpacks/russian/Plugins/ClientChangeNotify.txt @@ -51,8 +51,8 @@ Тест
[Ignore these clients (separated by semicolons):]
Игнорировать эти клиенты (через точку с запятой):
-[(you have to install pcre16.dll to use regular expressions here)]
-(чтобы использовать здесь регулярные выражения, установите pcre16.dll)
+[(you have to install pcre16.mir to use regular expressions here)]
+(чтобы использовать здесь регулярные выражения, установите pcre16.mir)
[changed client to %s (was %s)]
поменял(а) клиент на %s (был %s)
[changed client to %s]
diff --git a/langpacks/russian/Plugins/DbEditorPP.txt b/langpacks/russian/Plugins/DbEditorPP.txt index f0c5ac106b..0a4ee70cb6 100644 --- a/langpacks/russian/Plugins/DbEditorPP.txt +++ b/langpacks/russian/Plugins/DbEditorPP.txt @@ -203,8 +203,6 @@ Удалить модуль из базы
[Delete module from database... Loading]
Удаление модуля из базы... Загрузка
-[Delete module from all contacts (including Setting)]
-Удалить из всех контактов (с настройками)
[INI Files]
INI файлы
[All Files]
diff --git a/langpacks/russian/Plugins/MyDetails.txt b/langpacks/russian/Plugins/MyDetails.txt index 1fc8a1d788..ac75c9b03b 100644 --- a/langpacks/russian/Plugins/MyDetails.txt +++ b/langpacks/russian/Plugins/MyDetails.txt @@ -5,8 +5,6 @@ ; Version: 0.0.1.12
; Authors: Ricardo Pescuma Domenecci, Drugwash
;============================================================
-[Shows and allows you to edit your details for all protocols.]
-Плагин позволяет показывать и редактировать ваши детали для всех протоколов.
[Set my nickname]
Мой ник
[Nickname:]
diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt index 635839a2df..1707640e15 100644 --- a/langpacks/russian/Plugins/PluginUpdater.txt +++ b/langpacks/russian/Plugins/PluginUpdater.txt @@ -5,8 +5,6 @@ ; Version: 0.1.2.4
; Authors: Mataes, George Hazan
;============================================================
-[Plugin updater for Miranda NG.]
-Обновление плагинов Miranda NG.
[Updates found!]
Найдены обновления!
[PluginUpdater has detected updated versions of some Miranda components. Click on Details button to view more information.]
diff --git a/langpacks/russian/Plugins/UInfoEx.txt b/langpacks/russian/Plugins/UInfoEx.txt index a847109b91..ba4969c65b 100644 --- a/langpacks/russian/Plugins/UInfoEx.txt +++ b/langpacks/russian/Plugins/UInfoEx.txt @@ -401,8 +401,6 @@ Удалить выбранную запись?\n\t%s\n\t%s
[Other]
Другое
-[<Unspecified>]
-<не указано>
[ETA]
Осталось дней
[Contact]
diff --git a/langpacks/russian/Untranslated/DbEditorPP.txt b/langpacks/russian/Untranslated/DbEditorPP.txt index f02c53d6c2..30ed4b3586 100644 --- a/langpacks/russian/Untranslated/DbEditorPP.txt +++ b/langpacks/russian/Untranslated/DbEditorPP.txt @@ -1,8 +1,9 @@ [&Fix resident settings]
[&Inline edit]
[BL&OB]
+[Delete from all contacts (including Settings)]
[[UNLOADED]]
-[Fix resident setting deleting them from DB ?]
-[Deleted orphaned items: %d]
+[Delete resident settings from database?]
+[%d orphaned items deleted.]
[*** buggy resident ***]
[*** resident ***]
|