diff options
32 files changed, 65 insertions, 131 deletions
diff --git a/langpacks/belarusian/Plugins/MRA.txt b/langpacks/belarusian/Plugins/MRA.txt index 9e9a74cde3..c47690f927 100644 --- a/langpacks/belarusian/Plugins/MRA.txt +++ b/langpacks/belarusian/Plugins/MRA.txt @@ -234,8 +234,6 @@ xСтатус "%s" Анкета
[My Album]
Мой альбом
-[My Blog]
-Мой блог
[My Blog Status]
Мой блог статус
[My Video]
@@ -260,8 +258,6 @@ xСтатус "%s" Адправіць паштоўку
[&View Album]
Глядзець альбом
-[&Read Blog]
-Блог
[Reply Blog Status]
Адказаць на статус блога
[View Video]
diff --git a/langpacks/bulgarian/Plugins/Dbx_mmap.txt b/langpacks/bulgarian/Plugins/Dbx_mmap.txt index 852f1ad01c..f88201a88d 100644 --- a/langpacks/bulgarian/Plugins/Dbx_mmap.txt +++ b/langpacks/bulgarian/Plugins/Dbx_mmap.txt @@ -70,7 +70,7 @@ Първо събитие не е маркирано като такова: поправяне
[Event marked as first which is not: correcting]
Събитие е маркирано като първо, но не е: поправяне
-[Zero event's contact id: correcting]
+[Zero event's contact ID: correcting]
[Extra flags found in event: removing]
diff --git a/langpacks/bulgarian/Plugins/Dropbox.txt b/langpacks/bulgarian/Plugins/Dropbox.txt index 054167408a..c0653ebb02 100644 --- a/langpacks/bulgarian/Plugins/Dropbox.txt +++ b/langpacks/bulgarian/Plugins/Dropbox.txt @@ -5,7 +5,7 @@ ; Version: 0.11.0.2
; Authors: unsane
;============================================================
-[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
;file \plugins\Dropbox\res\resource.rc
[Authorization]
@@ -14,11 +14,11 @@ [Go to this link]
-[allow access to files in apps folder and copy the security code]
+[Allow access to app folder]
-[Enter the security code]
+[Enter authorization code]
-[Click authorize button]
+[Initiate authorization]
[Authorize]
@@ -28,14 +28,6 @@ [Check status of authorization]
-[Enter code]
-
-[Enter code below:]
-
-[OK]
-
-[Cancel]
-
;file \plugins\Dropbox\src\dropbox.cpp
[in process...]
diff --git a/langpacks/bulgarian/Plugins/MRA.txt b/langpacks/bulgarian/Plugins/MRA.txt index 97173f6c6e..a40e85391f 100644 --- a/langpacks/bulgarian/Plugins/MRA.txt +++ b/langpacks/bulgarian/Plugins/MRA.txt @@ -185,8 +185,6 @@ E-поща: [My Album]
-[My Blog]
-
[My Blog Status]
[My Video]
@@ -207,12 +205,12 @@ E-поща: Молба за упълномощаване
[Grant authorization]
Даване на пълномощно
+[&Send E-Mail]
+
[&Send postcard]
[&View Album]
-[&Read Blog]
-
[Reply Blog Status]
[View Video]
diff --git a/langpacks/english_gb/Plugins/Dropbox.txt b/langpacks/english_gb/Plugins/Dropbox.txt index 9cbbbbfc02..c40af689f1 100644 --- a/langpacks/english_gb/Plugins/Dropbox.txt +++ b/langpacks/english_gb/Plugins/Dropbox.txt @@ -7,8 +7,10 @@ ;============================================================
[Authorization]
Authorisation
-[Click authorize button]
-Click authorise button
+[Enter authorization code]
+Enter authorisation code
+[Initiate authorization]
+Initiate authorisation
[Authorize]
Authorise
[Check status of authorization]
diff --git a/langpacks/french/Plugins/Dbx_mmap.txt b/langpacks/french/Plugins/Dbx_mmap.txt index 85ffd9fa89..12dbc2a506 100644 --- a/langpacks/french/Plugins/Dbx_mmap.txt +++ b/langpacks/french/Plugins/Dbx_mmap.txt @@ -116,7 +116,7 @@ Mot de passe incorrect ! [Event marked as first which is not: correcting]
-[Zero event's contact id: correcting]
+[Zero event's contact ID: correcting]
[Extra flags found in event: removing]
diff --git a/langpacks/french/Plugins/Dropbox.txt b/langpacks/french/Plugins/Dropbox.txt index 054167408a..c0653ebb02 100644 --- a/langpacks/french/Plugins/Dropbox.txt +++ b/langpacks/french/Plugins/Dropbox.txt @@ -5,7 +5,7 @@ ; Version: 0.11.0.2
; Authors: unsane
;============================================================
-[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
;file \plugins\Dropbox\res\resource.rc
[Authorization]
@@ -14,11 +14,11 @@ [Go to this link]
-[allow access to files in apps folder and copy the security code]
+[Allow access to app folder]
-[Enter the security code]
+[Enter authorization code]
-[Click authorize button]
+[Initiate authorization]
[Authorize]
@@ -28,14 +28,6 @@ [Check status of authorization]
-[Enter code]
-
-[Enter code below:]
-
-[OK]
-
-[Cancel]
-
;file \plugins\Dropbox\src\dropbox.cpp
[in process...]
diff --git a/langpacks/french/Plugins/MRA.txt b/langpacks/french/Plugins/MRA.txt index a81bd33f1b..f717b01862 100644 --- a/langpacks/french/Plugins/MRA.txt +++ b/langpacks/french/Plugins/MRA.txt @@ -238,8 +238,6 @@ Poissons [My Album]
-[My Blog]
-
[My Blog Status]
[My Video]
@@ -260,12 +258,12 @@ Poissons Demander l'autorisation
[Grant authorization]
Accorder l'autorisation
+[&Send E-Mail]
+
[&Send postcard]
[&View Album]
-[&Read Blog]
-
[Reply Blog Status]
[View Video]
diff --git a/langpacks/french/Untranslated/Dbx_mmap.txt b/langpacks/french/Untranslated/Dbx_mmap.txt index b926a5417b..428fafedac 100644 --- a/langpacks/french/Untranslated/Dbx_mmap.txt +++ b/langpacks/french/Untranslated/Dbx_mmap.txt @@ -33,7 +33,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]
+[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/french/Untranslated/Dropbox.txt b/langpacks/french/Untranslated/Dropbox.txt index 79a008d252..cbd1480088 100644 --- a/langpacks/french/Untranslated/Dropbox.txt +++ b/langpacks/french/Untranslated/Dropbox.txt @@ -1,18 +1,14 @@ -[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
[Authorization]
[To allow Miranda NG access in your Dropbox account:]
[Go to this link]
-[allow access to files in apps folder and copy the security code]
-[Enter the security code]
-[Click authorize button]
+[Allow access to app folder]
+[Enter authorization code]
+[Initiate authorization]
[Authorize]
[Other]
[Use shortened share links]
[Check status of authorization]
-[Enter code]
-[Enter code below:]
-[OK]
-[Cancel]
[in process...]
[you have been authorized]
[unknown error]
diff --git a/langpacks/french/Untranslated/MRA.txt b/langpacks/french/Untranslated/MRA.txt index 681c695d24..09f3586d2e 100644 --- a/langpacks/french/Untranslated/MRA.txt +++ b/langpacks/french/Untranslated/MRA.txt @@ -68,7 +68,6 @@ [Display &Inbox status]
[Edit &Profile]
[My Album]
-[My Blog]
[My Blog Status]
[My Video]
[My Answers]
@@ -77,9 +76,9 @@ [Update all users info]
[Check users avatars updates]
[Request authorization for all]
+[&Send E-Mail]
[&Send postcard]
[&View Album]
-[&Read Blog]
[Reply Blog Status]
[View Video]
[Answers]
diff --git a/langpacks/german/Plugins/Dbx_mmap.txt b/langpacks/german/Plugins/Dbx_mmap.txt index 4446d87a37..a1a07c801c 100644 --- a/langpacks/german/Plugins/Dbx_mmap.txt +++ b/langpacks/german/Plugins/Dbx_mmap.txt @@ -116,7 +116,7 @@ Ereignisstrukturen beschädigt, nachfolgende Einträge wurden ignoriert Erstes Ereignis nicht als solches markiert: Korrigiert
[Event marked as first which is not: correcting]
Ereignis falschlicherweise als erstes markiert: Korrigiert
-[Zero event's contact id: correcting]
+[Zero event's contact ID: correcting]
[Extra flags found in event: removing]
Uberflussige Ereigniseigenschaften gefunden: Entfernt
diff --git a/langpacks/german/Plugins/Dropbox.txt b/langpacks/german/Plugins/Dropbox.txt index 054167408a..c0653ebb02 100644 --- a/langpacks/german/Plugins/Dropbox.txt +++ b/langpacks/german/Plugins/Dropbox.txt @@ -5,7 +5,7 @@ ; Version: 0.11.0.2
; Authors: unsane
;============================================================
-[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
;file \plugins\Dropbox\res\resource.rc
[Authorization]
@@ -14,11 +14,11 @@ [Go to this link]
-[allow access to files in apps folder and copy the security code]
+[Allow access to app folder]
-[Enter the security code]
+[Enter authorization code]
-[Click authorize button]
+[Initiate authorization]
[Authorize]
@@ -28,14 +28,6 @@ [Check status of authorization]
-[Enter code]
-
-[Enter code below:]
-
-[OK]
-
-[Cancel]
-
;file \plugins\Dropbox\src\dropbox.cpp
[in process...]
diff --git a/langpacks/german/Plugins/MRA.txt b/langpacks/german/Plugins/MRA.txt index af642e9710..85b3ff53a1 100644 --- a/langpacks/german/Plugins/MRA.txt +++ b/langpacks/german/Plugins/MRA.txt @@ -238,8 +238,6 @@ Status vom Poste&ingang anzeigen &Profil bearbeiten
[My Album]
Mein Album
-[My Blog]
-Mein Blog
[My Blog Status]
Mein Blog Status
[My Video]
@@ -260,12 +258,12 @@ Autorisierung für alle anfragen Autorisierung anfragen
[Grant authorization]
Autorisierung gewähren
+[&Send E-Mail]
+
[&Send postcard]
Postkarte &senden
[&View Album]
Album ansehen
-[&Read Blog]
-Blog lesen
[Reply Blog Status]
Blog-Status beantworten
[View Video]
diff --git a/langpacks/german/Untranslated/Dbx_mmap.txt b/langpacks/german/Untranslated/Dbx_mmap.txt index 7edf9305bd..f0dd4f073b 100644 --- a/langpacks/german/Untranslated/Dbx_mmap.txt +++ b/langpacks/german/Untranslated/Dbx_mmap.txt @@ -1,4 +1,4 @@ [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]
[Database conversion required]
-[Zero event's contact id: correcting]
+[Zero event's contact ID: correcting]
[Database version doesn't match this driver's one. Convert a database first]
diff --git a/langpacks/german/Untranslated/Dropbox.txt b/langpacks/german/Untranslated/Dropbox.txt index 79a008d252..cbd1480088 100644 --- a/langpacks/german/Untranslated/Dropbox.txt +++ b/langpacks/german/Untranslated/Dropbox.txt @@ -1,18 +1,14 @@ -[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
[Authorization]
[To allow Miranda NG access in your Dropbox account:]
[Go to this link]
-[allow access to files in apps folder and copy the security code]
-[Enter the security code]
-[Click authorize button]
+[Allow access to app folder]
+[Enter authorization code]
+[Initiate authorization]
[Authorize]
[Other]
[Use shortened share links]
[Check status of authorization]
-[Enter code]
-[Enter code below:]
-[OK]
-[Cancel]
[in process...]
[you have been authorized]
[unknown error]
diff --git a/langpacks/german/Untranslated/MRA.txt b/langpacks/german/Untranslated/MRA.txt index 1d4f56080d..6a6f2f3d44 100644 --- a/langpacks/german/Untranslated/MRA.txt +++ b/langpacks/german/Untranslated/MRA.txt @@ -1,3 +1,4 @@ [Automatic authorization on Mail.ru web services]
+[&Send E-Mail]
[Thread creation failure]
[Dating]
diff --git a/langpacks/polish/Untranslated/Dbx_mmap.txt b/langpacks/polish/Untranslated/Dbx_mmap.txt index 50ae79bcb8..ae8197099a 100644 --- a/langpacks/polish/Untranslated/Dbx_mmap.txt +++ b/langpacks/polish/Untranslated/Dbx_mmap.txt @@ -1 +1 @@ -[Zero event's contact id: correcting]
+[Zero event's contact ID: correcting]
diff --git a/langpacks/russian/Plugins/Dropbox.txt b/langpacks/russian/Plugins/Dropbox.txt index b9aa8d1281..5f38671c67 100644 --- a/langpacks/russian/Plugins/Dropbox.txt +++ b/langpacks/russian/Plugins/Dropbox.txt @@ -18,7 +18,7 @@ [Enter authorization code]
Ввести код авторизации
[Initiate authorization]
-Иниициировать авторизацию
+Инициировать авторизацию
[Authorize]
Авторизовать
[Other]
diff --git a/langpacks/slovak/Untranslated/Dbx_mmap.txt b/langpacks/slovak/Untranslated/Dbx_mmap.txt index 7985bba7ce..a41c99698d 100644 --- a/langpacks/slovak/Untranslated/Dbx_mmap.txt +++ b/langpacks/slovak/Untranslated/Dbx_mmap.txt @@ -47,7 +47,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]
+[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/slovak/Untranslated/Dropbox.txt b/langpacks/slovak/Untranslated/Dropbox.txt index 79a008d252..cbd1480088 100644 --- a/langpacks/slovak/Untranslated/Dropbox.txt +++ b/langpacks/slovak/Untranslated/Dropbox.txt @@ -1,18 +1,14 @@ -[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
[Authorization]
[To allow Miranda NG access in your Dropbox account:]
[Go to this link]
-[allow access to files in apps folder and copy the security code]
-[Enter the security code]
-[Click authorize button]
+[Allow access to app folder]
+[Enter authorization code]
+[Initiate authorization]
[Authorize]
[Other]
[Use shortened share links]
[Check status of authorization]
-[Enter code]
-[Enter code below:]
-[OK]
-[Cancel]
[in process...]
[you have been authorized]
[unknown error]
diff --git a/langpacks/slovak/Untranslated/MRA.txt b/langpacks/slovak/Untranslated/MRA.txt index 58c250ee75..fbd5dbc5f4 100644 --- a/langpacks/slovak/Untranslated/MRA.txt +++ b/langpacks/slovak/Untranslated/MRA.txt @@ -80,7 +80,6 @@ [Display &Inbox status]
[Edit &Profile]
[My Album]
-[My Blog]
[My Blog Status]
[My Video]
[My Answers]
@@ -91,9 +90,9 @@ [Request authorization for all]
[Request authorization]
[Grant authorization]
+[&Send E-Mail]
[&Send postcard]
[&View Album]
-[&Read Blog]
[Reply Blog Status]
[View Video]
[Answers]
diff --git a/langpacks/spanish/Plugins/Dbx_mmap.txt b/langpacks/spanish/Plugins/Dbx_mmap.txt index 5a2ac2f5d2..bac7f089c3 100644 --- a/langpacks/spanish/Plugins/Dbx_mmap.txt +++ b/langpacks/spanish/Plugins/Dbx_mmap.txt @@ -116,7 +116,7 @@ Base de datos [Event marked as first which is not: correcting]
-[Zero event's contact id: correcting]
+[Zero event's contact ID: correcting]
[Extra flags found in event: removing]
diff --git a/langpacks/spanish/Plugins/Dropbox.txt b/langpacks/spanish/Plugins/Dropbox.txt index 842b003663..4d6978d302 100644 --- a/langpacks/spanish/Plugins/Dropbox.txt +++ b/langpacks/spanish/Plugins/Dropbox.txt @@ -5,7 +5,7 @@ ; Version: 0.11.0.2
; Authors: unsane
;============================================================
-[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
;file \plugins\Dropbox\res\resource.rc
[Authorization]
@@ -14,11 +14,11 @@ [Go to this link]
-[allow access to files in apps folder and copy the security code]
+[Allow access to app folder]
-[Enter the security code]
+[Enter authorization code]
-[Click authorize button]
+[Initiate authorization]
[Authorize]
@@ -28,14 +28,6 @@ [Check status of authorization]
-[Enter code]
-
-[Enter code below:]
-
-[OK]
-
-[Cancel]
-
;file \plugins\Dropbox\src\dropbox.cpp
[in process...]
diff --git a/langpacks/spanish/Plugins/MRA.txt b/langpacks/spanish/Plugins/MRA.txt index fb0ee401b0..a3b178e7fd 100644 --- a/langpacks/spanish/Plugins/MRA.txt +++ b/langpacks/spanish/Plugins/MRA.txt @@ -238,8 +238,6 @@ Femenino [My Album]
-[My Blog]
-
[My Blog Status]
[My Video]
@@ -260,12 +258,12 @@ Femenino Solicitar autorización
[Grant authorization]
Conceder autorización
+[&Send E-Mail]
+
[&Send postcard]
[&View Album]
-[&Read Blog]
-
[Reply Blog Status]
[View Video]
diff --git a/langpacks/spanish/Untranslated/Dbx_mmap.txt b/langpacks/spanish/Untranslated/Dbx_mmap.txt index 79d6850fa0..e9db9b3c33 100644 --- a/langpacks/spanish/Untranslated/Dbx_mmap.txt +++ b/langpacks/spanish/Untranslated/Dbx_mmap.txt @@ -43,7 +43,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]
+[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/spanish/Untranslated/Dropbox.txt b/langpacks/spanish/Untranslated/Dropbox.txt index 79a008d252..cbd1480088 100644 --- a/langpacks/spanish/Untranslated/Dropbox.txt +++ b/langpacks/spanish/Untranslated/Dropbox.txt @@ -1,18 +1,14 @@ -[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
[Authorization]
[To allow Miranda NG access in your Dropbox account:]
[Go to this link]
-[allow access to files in apps folder and copy the security code]
-[Enter the security code]
-[Click authorize button]
+[Allow access to app folder]
+[Enter authorization code]
+[Initiate authorization]
[Authorize]
[Other]
[Use shortened share links]
[Check status of authorization]
-[Enter code]
-[Enter code below:]
-[OK]
-[Cancel]
[in process...]
[you have been authorized]
[unknown error]
diff --git a/langpacks/spanish/Untranslated/MRA.txt b/langpacks/spanish/Untranslated/MRA.txt index 7e33e86256..1802d7d5fb 100644 --- a/langpacks/spanish/Untranslated/MRA.txt +++ b/langpacks/spanish/Untranslated/MRA.txt @@ -86,7 +86,6 @@ [Display &Inbox status]
[Edit &Profile]
[My Album]
-[My Blog]
[My Blog Status]
[My Video]
[My Answers]
@@ -95,9 +94,9 @@ [Update all users info]
[Check users avatars updates]
[Request authorization for all]
+[&Send E-Mail]
[&Send postcard]
[&View Album]
-[&Read Blog]
[Reply Blog Status]
[View Video]
[Answers]
diff --git a/langpacks/ukrainian/Plugins/Dropbox.txt b/langpacks/ukrainian/Plugins/Dropbox.txt index a51b624ab8..cead42fe37 100644 --- a/langpacks/ukrainian/Plugins/Dropbox.txt +++ b/langpacks/ukrainian/Plugins/Dropbox.txt @@ -5,7 +5,7 @@ ; Version: 0.11.0.2
; Authors: unsane
;============================================================
-[Provides ability to upload files on Dropbox.]
+[Allows to transfer files via Dropbox.]
Плагін для завантаження і пересилання файлів за допомогою Dropbox.
[Authorization]
Авторизація
@@ -13,11 +13,11 @@ Щоб надати Miranda NG доступ до вашого облікового запису Dropbox:
[Go to this link]
Перейдіть
-[allow access to files in apps folder and copy the security code]
-дозвольте доступ до файлів у папці apps і скопіюйте код
-[Enter the security code]
+[Allow access to app folder]
+Дозвольте доступ до файлів у папці apps
+[Enter authorization code]
Введіть код
-[Click authorize button]
+[Initiate authorization]
Натисніть кнопку
[Authorize]
Авторизувати
@@ -27,12 +27,6 @@ Скорочувати посилання
[Check status of authorization]
Перевірка стану авторизації:
-[Enter code]
-Введіть код
-[Enter code below:]
-Введіть код зі сторінки:
-[Cancel]
-Скасувати
[in process...]
зачекайте...
[you have been authorized]
diff --git a/langpacks/ukrainian/Untranslated/Dropbox.txt b/langpacks/ukrainian/Untranslated/Dropbox.txt deleted file mode 100644 index 4fc7df80e3..0000000000 --- a/langpacks/ukrainian/Untranslated/Dropbox.txt +++ /dev/null @@ -1 +0,0 @@ -[OK]
diff --git a/langpacks/ukrainian/Untranslated/MRA.txt b/langpacks/ukrainian/Untranslated/MRA.txt index 0d3f773f32..779df0b201 100644 --- a/langpacks/ukrainian/Untranslated/MRA.txt +++ b/langpacks/ukrainian/Untranslated/MRA.txt @@ -1,2 +1,3 @@ [OK]
+[&Send E-Mail]
[MRA]
diff --git a/plugins/Dropbox/src/dropbox_utils.cpp b/plugins/Dropbox/src/dropbox_utils.cpp index e3a05093df..ecf6c584a0 100644 --- a/plugins/Dropbox/src/dropbox_utils.cpp +++ b/plugins/Dropbox/src/dropbox_utils.cpp @@ -13,7 +13,7 @@ wchar_t *CDropbox::HttpStatusToText(HTTP_STATUS status) switch (status)
{
case HTTP_STATUS_OK:
- return TranslateT("Ok");
+ return TranslateT("OK");
case HTTP_STATUS_BAD_REQUEST:
return TranslateT("Bad input parameter. Error message should indicate which one and why");
case HTTP_STATUS_UNAUTHORIZED:
|