- Dropbox: small resource fix

- langpacks/ukrainian: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@8458 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

16 files changed, 156 insertions, 79 deletions

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index d0cce1cae6..831bcd9083 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -128,6 +128,7 @@
 [Group: %name% %count% [%mode%]]

 [Divider: %s]

 [Info: %s]

+[Contact list]

 [List]

 ;file \plugins\Clist_blind\src\clistopts.cpp

 [Global]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 0225ac6c3c..0c4d11e2dc 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -126,8 +126,8 @@
 [Disable groups]

 [Ask before deleting contacts]

 [Don't move offline user to bottom]

-[Contact List]

-[Contact List Sorting]

+[Contact list]

+[Contact list sorting]

 [Place offline users out of groups]

 [Gamma correction]

 [Default]

@@ -336,7 +336,7 @@
 [Modern contact list]

 [Avatar Overlay]

 [Status Overlay]

-[Contact List smileys]

+[Contact list smileys]

 [List background]

 [Menu background]

 [Status bar background]

@@ -479,7 +479,7 @@
 [Error]

 ;file \plugins\Clist_modern\src\modern_skinopt.cpp

 [Load/Save]

-[Object Editor]

+[Object editor]

 [( unknown )]

 [%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]

 [%s\n\n%s\n\nAuthor(s): %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 5174f189a7..3c927e76c2 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -65,6 +65,7 @@
 [Event chain corrupted, further entries ignored]

 [First event not marked as such: correcting]

 [Event marked as first which is not: correcting]

+[Zero event's contact id: correcting]

 [Extra flags found in event: removing]

 [First unread event marked wrong: fixing]

 [Infeasibly large event blob: skipping]

diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index 6373306ca9..6eeffb7963 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Dropbox.dll

 ;  Plugin: Dropbox

-;  Version: 0.11.0.1

+;  Version: 0.11.0.2

 ;  Authors: unsane

 ;============================================================

 [Provides ability to upload files on Dropbox.]

@@ -10,36 +10,45 @@
 [Authorization]

 [To allow Miranda NG access in your Dropbox account:]

 [Go to this link]

-[and allow access to files in apps folder]

+[allow access to files in apps folder and copy the security code]

 [Enter the security code ]

 [Click authorize button]

 [Authorize]

 [Other]

 [Use shortened share links]

+[Check status of authorization]

 [Enter code]

 [Enter code below:]

 [OK]

 [Cancel]

 ;file \plugins\Dropbox\src\dropbox.cpp

 [You have been authorized]

-[Are you sure you want to request authorization?]

-[Request authorization]

-[Are you sure you want to revoke authorization?]

-[Revoke authorization]

+[in process...]

+[you have been authorized]

+[unknown error]

 ;file \plugins\Dropbox\src\dropbox_commands.cpp

+[Dropbox supports the following commands:]

+[shows all files in folder "dir" ("dir" can be omitted for root folder)]

+[returns download link for file or folder with specified path ("path" is relative from root folder)]

+[deletes file or folder with specified path ("path" is relative from root folder)]

 [is file]

 [is empty]

+["%s"command has invalid parameter.\nUse "/help" for more info.]

 [is not deleted]

 [is deleted]

 ;file \plugins\Dropbox\src\dropbox_dialogs.cpp

+[you are already authorized]

+[you are not authorized yet]

 ;file \plugins\Dropbox\src\dropbox_events.cpp

 [Send files to Dropbox]

 [Network]

-[Dropbox]

 ;file \plugins\Dropbox\src\dropbox_icons.cpp

 [Protocols]

 [Protocol icon]

 ;file \plugins\Dropbox\src\dropbox_menus.cpp

+;file \plugins\Dropbox\src\dropbox_services.cpp

+[Unknown command "%s".\nUse "/help" for more info.]

+["%s" is not valid.\nUse "/help" for more info.]

 ;file \plugins\Dropbox\src\dropbox_transfers.cpp

 [Server does not respond]

 [Link to download file "%s": %s]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index cde378e927..caa53ddad7 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -18,7 +18,7 @@
 [Automatically add contacts to server list on logon]

 [Automatically grant authorization to users in contact list]

 [Automatically grant authorization to new users]

-[Automatic authorization on mail.ru web services]

+[Automatic authorization on Mail.ru web services]

 [Notify me when a message delivery has failed]

 [Notify about new mail if increment]

 [Notify about new mail tray icon]

@@ -259,3 +259,4 @@
 [Squirrel]

 [Star]

 [Music]

+[Dating]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index f841fd135f..e5df53f67e 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -83,5 +83,6 @@
 [Next protocol]

 [Set My Nickname for %s]

 [Set My Status Message for %s]

-[Contact List]

+[Contact list]

 ;file \plugins\MyDetails\src\options.cpp

+[Contact List]

diff --git a/langpacks/ukrainian/Plugins/Clist_blind.txt b/langpacks/ukrainian/Plugins/Clist_blind.txt
index effb1aa9d1..6602433b76 100644
--- a/langpacks/ukrainian/Plugins/Clist_blind.txt
+++ b/langpacks/ukrainian/Plugins/Clist_blind.txt
@@ -247,6 +247,8 @@ Cписок неактивний
 Роздільник: %s

 [Info: %s]

 Інфо: %s

+[Contact list]

+Список контактів

 [List]

 Список

 [Global]

diff --git a/langpacks/ukrainian/Plugins/Clist_modern.txt b/langpacks/ukrainian/Plugins/Clist_modern.txt
index 0488d0cb48..aa72a65850 100644
--- a/langpacks/ukrainian/Plugins/Clist_modern.txt
+++ b/langpacks/ukrainian/Plugins/Clist_modern.txt
@@ -237,9 +237,9 @@ Ctrl+ЛКМ - ввімк. фільтр за протоколом, клік по
 Запит перед видаленням

 [Don't move offline user to bottom]

 Не переміщати відключених вниз

-[Contact List]

+[Contact list]

 Список контактів

-[Contact List Sorting]

+[Contact list sorting]

 Впорядкування списку

 [Place offline users out of groups]

 Відключених показувати поза групами

@@ -895,7 +895,7 @@ Cписок неактивний
 Помилка

 [Load/Save]

 Завантажити/Зберегти

-[Object Editor]

+[Object editor]

 Редактор об'єктів

 [%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s]

 %s\n\n%s\n\nАвтор(и):\t %s\nКонтакт:\t %s\nWeb:\t %s\n\nФайл:\t %s

diff --git a/langpacks/ukrainian/Plugins/Dropbox.txt b/langpacks/ukrainian/Plugins/Dropbox.txt
index 5a45e672eb..bc770e570d 100644
--- a/langpacks/ukrainian/Plugins/Dropbox.txt
+++ b/langpacks/ukrainian/Plugins/Dropbox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Dropbox.dll

 ;  Plugin: Dropbox

-;  Version: 0.11.0.1

+;  Version: 0.11.0.2

 ;  Authors: unsane

 ;============================================================

 [Provides ability to upload files on Dropbox.]

@@ -10,21 +10,23 @@
 [Authorization]

 Авторизація

 [To allow Miranda NG access in your Dropbox account:]

-Надати Miranda NG доступ до вашого облікового запису Dropbox:

+Щоб надати Miranda NG доступ до вашого облікового запису Dropbox:

 [Go to this link]

-Перейти

-[and allow access to files in apps folder]

-і дозволити доступ до файлів у папці додатку

+Перейдіть

+[allow access to files in apps folder and copy the security code]

+, дозвольте доступ до файлів у папці додатку й скопіюйте код

 [Enter the security code ]

-Ввести код безпеки\s

+Введіть код

 [Click authorize button]

-Натисніть "Авторизувати"

+Натисніть кнопку

 [Authorize]

 Авторизувати

 [Other]

 Інше

 [Use shortened share links]

 Скорочувати посилання

+[Check status of authorization]

+Перевірити стан авторизації

 [Enter code]

 Введіть код

 [Enter code below:]

@@ -33,22 +35,34 @@
 Скасувати

 [You have been authorized]

 Авторизація пройшла успішно

-[Are you sure you want to request authorization?]

-Ви впевнені, що хочете запитати авторизацію?

-[Request authorization]

-Запит авторизації

-[Are you sure you want to revoke authorization?]

-Ви впевнені, що хочете відкликати авторизацію?

-[Revoke authorization]

-Відкликати авторизацію

+[in process...]

+зачекайте...

+[you have been authorized]

+авторизація пройшла успішно

+[unknown error]

+невідома помилка

+[Dropbox supports the following commands:]

+Доступні команди:

+[shows all files in folder "dir" ("dir" can be omitted for root folder)]

+показує всі файли в папці "dir" (для кореневої папки "dir" можна пропустити)

+[returns download link for file or folder with specified path ("path" is relative from root folder)]

+повертає посилання на файл або папку за вказаним шляхом "path" (відносно кореневої папки)

+[deletes file or folder with specified path ("path" is relative from root folder)]

+видаляє файл або папку за вказаним шляхом "path" (відносно кореневої папки)

 [is file]

 файл

 [is empty]

 порожня

+["%s" command has invalid parameter.\nUse "/help" for more info.]

+Неправильний параметр команди "%s".\nНаберіть "/help" для довідки.

 [is not deleted]

 не видалений

 [is deleted]

 видалений

+[you are already authorized]

+ви вже авторизовані

+[you are not authorized yet]

+ви ще не авторизовані

 [Send files to Dropbox]

 Файл через Dropbox

 [Network]

@@ -57,6 +71,8 @@
 Протоколи

 [Protocol icon]

 Значок протоколу

+[Unknown command "%s".\nUse "/help" for more info.]

+Невідома команда "%s".\nНаберіть "/help" для довідки.]

 [Server does not respond]

 Сервер не відповідає

 [Link to download file "%s": %s]

diff --git a/langpacks/ukrainian/Plugins/HistoryStats.txt b/langpacks/ukrainian/Plugins/HistoryStats.txt
index bbd5205bee..ce42c7ad22 100644
--- a/langpacks/ukrainian/Plugins/HistoryStats.txt
+++ b/langpacks/ukrainian/Plugins/HistoryStats.txt
@@ -61,6 +61,92 @@ HistoryStats - Фільтр слів/повідомлень
 Налаштувати HistoryStats

 [Apply]

 Застосувати

+[Extract words from]

+Брати слова з

+[Ignore words shorter than (chars)]

+Ігнорувати слова коротші (символів)

+[Ignore words longer than (chars, 0=no limit)]

+Ігнорувати слова довші (символів, 0=без обмежень)

+[Filter URLs/e-mail addresses]

+Фільтрувати адреси URL/E-mail

+[Filter words/messages]

+Фільтрувати слова/повідомлення

+[Define...]

+Визначити...

+[Chat duration type]

+Тип продолжительности чата

+[Minimum]

+Мінімум

+[Average]

+Середнє

+[Maximum]

+Максимум

+[Other information in tooltip]

+Інша інформація в підказці

+[Chat duration]

+Тривалість розмови

+[[Min] #{amount}]

+(Мінімум) #{amount}

+[[Avg] #{amount}]

+(Середнє) #{amount}

+[[Max] #{amount}]

+(Максимум) #{amount}

+[[Sum] #{amount}]

+(Разом) #{amount}

+[Events to count]

+Рахувати події

+[URLs (incoming)]

+URL (вхідні)

+[URLs (outgoing)]

+URL (вихідні)

+[URLs (all)]

+URL (усі)

+[Files (incoming)]

+Файли (вхідні)

+[Files (outgoing)]

+Файли (вихідні)

+[Files (all)]

+Файли (всі)

+[URLs]

+Посилання

+[Files]

+Файли

+[Events]

+Події

+[Group]

+Група

+[Display as]

+Показувати як

+[Absolute]

+Абсолютно

+[Units per day]

+Блоків на день

+[Units per week]

+Блоків на тиждень

+[Units per month (30 days)]

+Блоків на місяць

+[Messages]

+Повідомлення

+[Chats]

+Чати

+[day]

+день

+[week]

+тиждень

+[month]

+місяць

+[Outgoing]

+Вихідні

+[Incoming]

+Вхідні

+[Nick]

+Нік

+[Omitted]

+Пропущено

+[Totals]

+Разом

+[Protocol]

+Протокол

 [wday3:Mon]

 wday3:Пнд

 [wday3:Tue]

diff --git a/langpacks/ukrainian/Plugins/MRA.txt b/langpacks/ukrainian/Plugins/MRA.txt
index ee7cca89b7..5007459ea7 100644
--- a/langpacks/ukrainian/Plugins/MRA.txt
+++ b/langpacks/ukrainian/Plugins/MRA.txt
@@ -29,7 +29,7 @@
 Автоматично авторизувати користувачів зі списку

 [Automatically grant authorization to new users]

 Автоматично авторизувати нових користувачів

-[Automatic authorization on mail.ru web services]

+[Automatic authorization on Mail.ru web services]

 Автоматична авторизація на веб-сервісах Mail.ru

 [Notify me when a message delivery has failed]

 Сповіщати про невдалу доставку повідомлень

@@ -481,3 +481,5 @@ MRIM_CS_SMS_ACK: не знайдений в черзі
 Зірка

 [Music]

 Музика

+[Dating]

+Побачення

diff --git a/langpacks/ukrainian/Plugins/MyDetails.txt b/langpacks/ukrainian/Plugins/MyDetails.txt
index 96f3d007e1..61a584d3d9 100644
--- a/langpacks/ukrainian/Plugins/MyDetails.txt
+++ b/langpacks/ukrainian/Plugins/MyDetails.txt
@@ -147,5 +147,5 @@
 Змінити мій нік для %s

 [Set My Status Message for %s]

 Встановити статус для %s

-[Contact List]

+[Contact list]

 Список контактів

diff --git a/langpacks/ukrainian/Untranslated/Clist_modern.txt b/langpacks/ukrainian/Untranslated/Clist_modern.txt
index ea43cfeb4f..b3c4e153d6 100644
--- a/langpacks/ukrainian/Untranslated/Clist_modern.txt
+++ b/langpacks/ukrainian/Untranslated/Clist_modern.txt
@@ -4,7 +4,7 @@
 [Editing view mode]

 [UNDER CONSTRUCTION!!!           IT DOES NOT WORK]

 [Layered]

-[Contact List smileys]

+[Contact list smileys]

 [Row design]

 [Empty %s cell]

 [column]

diff --git a/langpacks/ukrainian/Untranslated/Dbx_mmap.txt b/langpacks/ukrainian/Untranslated/Dbx_mmap.txt
new file mode 100644
index 0000000000..50ae79bcb8
--- /dev/null
+++ b/langpacks/ukrainian/Untranslated/Dbx_mmap.txt
@@ -0,0 +1 @@
+[Zero event's contact id: correcting]

diff --git a/langpacks/ukrainian/Untranslated/HistoryStats.txt b/langpacks/ukrainian/Untranslated/HistoryStats.txt
index b767acc1fd..5503f5dc1c 100644
--- a/langpacks/ukrainian/Untranslated/HistoryStats.txt
+++ b/langpacks/ukrainian/Untranslated/HistoryStats.txt
@@ -1,55 +1,23 @@
 [Band]

 [OK]

-[Extract words from]

 [Incoming messages]

 [Outgoing messages]

 [All messages]

-[Ignore words shorter than (chars)]

-[Ignore words longer than (chars, 0=no limit)]

-[Filter URLs/e-mail addresses]

-[Filter words/messages]

-[Define...]

-[Chat duration type]

-[Minimum]

-[Average]

-[Maximum]

 [Total (sum of all chats)]

 [Show bar graph for chat duration type]

-[Other information in tooltip]

 [Minimum chat duration]

 [Average chat duration]

 [Maximum chat duration]

 [Total chat duration]

-[Chat duration]

 [(unknown)]

-[[Min] #{amount}]

-[[Avg] #{amount}]

-[[Max] #{amount}]

-[[Sum] #{amount}]

 [Column holding the amount of time you have chatted with the given contact.]

-[Events to count]

-[URLs (incoming)]

-[URLs (outgoing)]

-[URLs (all)]

-[Files (incoming)]

-[Files (outgoing)]

-[Files (all)]

-[URLs]

-[Files]

 [Incoming URLs]

 [Outgoing URLs]

 [Incoming files]

 [Outgoing files]

-[Events]

 [Column holding event counts for incoming, outgoing or total number of files or URLs.]

-[Group]

 [Column holding the contact list's group name the contact is in.]

 [Data source]

-[Display as]

-[Absolute]

-[Units per day]

-[Units per week]

-[Units per month (30 days)]

 [Characters (incoming)]

 [Characters (outgoing)]

 [Characters (all)]

@@ -60,15 +28,10 @@
 [Chats (outgoing)]

 [Chats (all)]

 [Characters]

-[Messages]

-[Chats]

 [Incoming characters]

 [Outgoing characters]

 [Incoming chats]

 [Outgoing chats]

-[day]

-[week]

-[month]

 [#{data} per #{unit}]

 [In/out]

 [Column holding counts for incoming, outgoing or total characters, messages or chats. This column can display absolute and average values.]

@@ -77,22 +40,16 @@
 [Percentage in tooltip]

 [Absolute in tooltip if average selected and vice versa]

 [Percentage in bar graph]

-[Outgoing]

-[Incoming]

 [[Out] #{out_amount} (#{out_ratio}) / [In] #{in_amount} (#{in_ratio})]

 [[Out] #{out_amount} / [In] #{in_amount}]

 [In/out graph]

 [Column holding in/out bar graphs for characters, messages or chats.]

 [First/last message time (tooltip)]

 [Show countact count for omitted/totals (tooltip)]

-[Nick]

 [[First] #{first_time} / [Last] #{last_time}]

 [#{count} contacts / [First] #{first_time} / [Last] #{last_time}]

 [#{count} contacts]

-[Omitted]

-[Totals]

 [Column holding the contact's nick and first/last message time if selected.]

-[Protocol]

 [Column holding the contact's protocol.]

 [Rank]

 [#{rank}.]

diff --git a/plugins/Dropbox/src/dropbox_commands.cpp b/plugins/Dropbox/src/dropbox_commands.cpp
index ff819ddc2b..736d1bbdc4 100644
--- a/plugins/Dropbox/src/dropbox_commands.cpp
+++ b/plugins/Dropbox/src/dropbox_commands.cpp
@@ -105,7 +105,7 @@ void CDropbox::CommandShare(void *arg)
 	}

 	else

 	{

-		CMStringA error; error.AppendFormat(Translate("\"%s\"command has invalid parameter.\nUse \"/help\" for more info."), "/share");

+		CMStringA error; error.AppendFormat(Translate("\"%s\" command has invalid parameter.\nUse \"/help\" for more info."), "/share");

 		ProtoBroadcastAck(MODULE, param->hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, param->hProcess, 0);

 		CallContactService(param->instance->GetDefaultContact(), PSR_MESSAGE, 0, (LPARAM)error.GetBuffer());

 

@@ -152,7 +152,7 @@ void CDropbox::CommandDelete(void *arg)
 	}

 	else

 	{

-		CMStringA error; error.AppendFormat(Translate("\"%s\"command has invalid parameter.\nUse \"/help\" for more info."), "/delete");

+		CMStringA error; error.AppendFormat(Translate("\"%s\" command has invalid parameter.\nUse \"/help\" for more info."), "/delete");

 		ProtoBroadcastAck(MODULE, param->hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, param->hProcess, 0);

 		CallContactService(param->instance->GetDefaultContact(), PSR_MESSAGE, 0, (LPARAM)error.GetBuffer());

 	}