- cosmetics (patch from dartraiden)

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

29 files changed, 33 insertions, 60 deletions

diff --git a/langpacks/belarusian/Plugins/AIM.txt b/langpacks/belarusian/Plugins/AIM.txt
index 769c3e9da4..b298ba13b1 100644
--- a/langpacks/belarusian/Plugins/AIM.txt
+++ b/langpacks/belarusian/Plugins/AIM.txt
@@ -44,8 +44,8 @@ AIM Дэталі карыстача
 Перадачы файлаў праз проксі

 [Masquerade as a Sidekick/Hiptop User]

 Уяўляцца як Sidekick/Hiptop

-[*Aim must be reconnected  for some option to take effect.]

-*AIM павінен быць перадалучаны, каб змены набылі моц.

+[*Aim must be reconnected for some option to take effect]

+*AIM павінен быць перадалучаны, каб змены набылі моц

 [Connection]

 Далучэнне

 [Port:]

diff --git a/langpacks/belarusian/Plugins/StatusChange.txt b/langpacks/belarusian/Plugins/StatusChange.txt
index 3ecef54a77..2781dfb2cd 100644
--- a/langpacks/belarusian/Plugins/StatusChange.txt
+++ b/langpacks/belarusian/Plugins/StatusChange.txt
@@ -43,7 +43,7 @@
 [...change status to...]

 ...змяніць статус на...

 [... if status is...]

-...калі статус...                                                                                        

+...калі статус...

 ;file \plugins\StatusChange\src\main.cpp

 [Status Change]

 Змена статусу

diff --git a/langpacks/bulgarian/=CORE=.txt b/langpacks/bulgarian/=CORE=.txt
index 0e99167035..3e859551e4 100644
--- a/langpacks/bulgarian/=CORE=.txt
+++ b/langpacks/bulgarian/=CORE=.txt
@@ -590,8 +590,6 @@ Popup за приставката Chat
 Отваряне в текущия прозорец

 [Message]

 Съобщение

-[Undo  ]

-Отмяна

 [Redo]

 Възстановяване

 [Copy]

diff --git a/langpacks/bulgarian/=DUPES=.txt b/langpacks/bulgarian/=DUPES=.txt
index 91083c9a95..0bcc6a226a 100644
--- a/langpacks/bulgarian/=DUPES=.txt
+++ b/langpacks/bulgarian/=DUPES=.txt
@@ -335,8 +335,6 @@ Copyright:
 Отваряне в текущия прозорец

 [Message]

 Съобщение

-[Undo  ]

-Отмяна

 [Redo]

 Възстановяване

 [Copy]

diff --git a/langpacks/bulgarian/Plugins/AIM.txt b/langpacks/bulgarian/Plugins/AIM.txt
index 6b50dab939..b3084317e3 100644
--- a/langpacks/bulgarian/Plugins/AIM.txt
+++ b/langpacks/bulgarian/Plugins/AIM.txt
@@ -34,8 +34,8 @@ AIM настройки
 Бездействащ веднага след вписване

 [Force Proxy File Transfers]

 Задължително прехвърляне на файлове през прокси сървър

-[*Aim must be reconnected  for some option to take effect.]

-*Необходимо е Aim да се свърже наново, за да бъдат осъществени.

+[*Aim must be reconnected for some option to take effect]

+*Необходимо е Aim да се свърже наново, за да бъдат осъществени

 [Port:]

 Порт:

 [Reset]

diff --git a/langpacks/chinese/=CORE=.txt b/langpacks/chinese/=CORE=.txt
index a261ec697c..a5abaf4ab2 100644
--- a/langpacks/chinese/=CORE=.txt
+++ b/langpacks/chinese/=CORE=.txt
@@ -608,8 +608,6 @@ Miranda NG 正准备重启. \n请稍候...
 在当前浏览器窗口中打开(&O)

 [Message]

 消息

-[Undo  ]

-撤销

 [Redo]

 重做

 [Copy]

diff --git a/langpacks/chinese/Plugins/AIM.txt b/langpacks/chinese/Plugins/AIM.txt
index eba4a1d638..acfd4e067a 100644
--- a/langpacks/chinese/Plugins/AIM.txt
+++ b/langpacks/chinese/Plugins/AIM.txt
@@ -38,8 +38,8 @@ AIM 选项
 强制使用代理服务器进行文件传输

 [Masquerade as a Sidekick/Hiptop User]

 伪装成 Sidekick/Hiptop 用户

-[*Aim must be reconnected  for some option to take effect.]

-*Aim 必须重新连接才能使某些选项生效. 

+[*Aim must be reconnected for some option to take effect]

+*Aim 必须重新连接才能使某些选项生效

 [Port:]

 端口:

 [Reset]

diff --git a/langpacks/dutch/=CORE=.txt b/langpacks/dutch/=CORE=.txt
index d0d734a5e7..7678a967f9 100644
--- a/langpacks/dutch/=CORE=.txt
+++ b/langpacks/dutch/=CORE=.txt
@@ -390,8 +390,6 @@ Een &nieuw browser scherm openen
 On huidige browser scherm &openen

 [Message]

 Bericht

-[Undo  ]

-Ongedaan maken

 [Redo]

 Opnieuw

 [Copy]

diff --git a/langpacks/estonian/=CORE=.txt b/langpacks/estonian/=CORE=.txt
index b99eb12e18..327664800a 100644
--- a/langpacks/estonian/=CORE=.txt
+++ b/langpacks/estonian/=CORE=.txt
@@ -338,8 +338,6 @@ Wikipedia
 Link

 [Message]

 Teade

-[Undo  ]

-Ennista 

 [Copy]

 Kopeeri

 [Cut]

diff --git a/langpacks/french/Plugins/AIM.txt b/langpacks/french/Plugins/AIM.txt
index 1dbaee2c6e..014ccbaed2 100644
--- a/langpacks/french/Plugins/AIM.txt
+++ b/langpacks/french/Plugins/AIM.txt
@@ -30,8 +30,8 @@ Options avancées
 Être inactif au démarrage

 [Force Proxy File Transfers]

 Transfert de fichier par Proxy

-[*Aim must be reconnected  for some option to take effect.]

-*AIM doit être reconnecter pour valider certaines options.

+[*Aim must be reconnected for some option to take effect]

+*AIM doit être reconnecter pour valider certaines options

 [Port:]

 Port :

 [Reset]

diff --git a/langpacks/hebrew/Plugins/AIM.txt b/langpacks/hebrew/Plugins/AIM.txt
index d6331bf41a..5cc7371fc7 100644
--- a/langpacks/hebrew/Plugins/AIM.txt
+++ b/langpacks/hebrew/Plugins/AIM.txt
@@ -36,8 +36,8 @@ AIM אפשרויות
 הכרח העברת קבצים דרך פרוקסי

 [Masquerade as a Sidekick/Hiptop User]

 הסתר כ Sidekick/Hiptop משתמש

-[*Aim must be reconnected  for some option to take effect.]

-*Aim חייב להתנתק ולהתחבר מחדש בשביל שהשינויים יתרחשו.

+[*Aim must be reconnected for some option to take effect]

+*Aim חייב להתנתק ולהתחבר מחדש בשביל שהשינויים יתרחשו

 [Port:]

 יציאה:

 [Reset]

diff --git a/langpacks/hungarian/=CORE=.txt b/langpacks/hungarian/=CORE=.txt
index f7d4664642..f589deef18 100644
--- a/langpacks/hungarian/=CORE=.txt
+++ b/langpacks/hungarian/=CORE=.txt
@@ -538,8 +538,6 @@ Hivatkozás
 Megnyitás az aktuális böngészõ ablakban

 [Message]

 Üzenet

-[Undo  ]

-Visszavonás  

 [Redo]

 Újra

 [Copy]

diff --git a/langpacks/hungarian/Plugins/AIM.txt b/langpacks/hungarian/Plugins/AIM.txt
index 134b382cf6..659bdbc224 100644
--- a/langpacks/hungarian/Plugins/AIM.txt
+++ b/langpacks/hungarian/Plugins/AIM.txt
@@ -34,8 +34,8 @@ Azonnali idle bejelentkezéskor
 Proxy fájlátvitelek kényszerítése

 [Masquerade as a Sidekick/Hiptop User]

 Álcázás oldal-csúszkás/kinyitható felhasználóként

-[*Aim must be reconnected  for some option to take effect.]

-*Aim újracsatlakoztatása szükséges néhány beállítás életbelépéséhez.

+[*Aim must be reconnected for some option to take effect]

+*Aim újracsatlakoztatása szükséges néhány beállítás életbelépéséhez

 [Port:]

 Port:

 [Reset]

diff --git a/langpacks/japanese/=CORE=.txt b/langpacks/japanese/=CORE=.txt
index 5ed303be3f..0ef05b1915 100644
--- a/langpacks/japanese/=CORE=.txt
+++ b/langpacks/japanese/=CORE=.txt
@@ -620,8 +620,6 @@ Wikipedia
 現在のブラウザウィンドウを開く (&O)

 [Message]

 メッセージ

-[Undo  ]

-取り消し　

 [Redo]

 やり直し

 [Copy]

diff --git a/langpacks/japanese/Plugins/AIM.txt b/langpacks/japanese/Plugins/AIM.txt
index 683679d6f6..002feae4a6 100644
--- a/langpacks/japanese/Plugins/AIM.txt
+++ b/langpacks/japanese/Plugins/AIM.txt
@@ -38,7 +38,7 @@ AIM オプション
 プロキシファイル転送を強制

 [Masquerade as a Sidekick/Hiptop User]

 Sidekick / Hiptop ユーザーを装う

-[*Aim must be reconnected  for some option to take effect.]

+[*Aim must be reconnected for some option to take effect]

 * Aim にいくつかのオプションを反映させるには再接続が必要です

 [Port:]

 ポート :

diff --git a/langpacks/norwegian/=CORE=.txt b/langpacks/norwegian/=CORE=.txt
index 22a22a180c..aea75b00ff 100644
--- a/langpacks/norwegian/=CORE=.txt
+++ b/langpacks/norwegian/=CORE=.txt
@@ -520,8 +520,6 @@ Link
 Melding

 [Message]

 Melding

-[Undo  ]

-Omgjør  

 [Redo]

 Gjør om

 [Copy]

diff --git a/langpacks/polish/Plugins/AIM.txt b/langpacks/polish/Plugins/AIM.txt
index 3ea6fda71e..efb4eeb6e7 100644
--- a/langpacks/polish/Plugins/AIM.txt
+++ b/langpacks/polish/Plugins/AIM.txt
@@ -44,8 +44,8 @@ Chwilowa bezczynność przy logowaniu
 Wymuszanie transferu plików przez proxy

 [Masquerade as a Sidekick/Hiptop User]

 Wystąp jako użytkownik Sidekick/Hiptop

-[*Aim must be reconnected  for some option to take effect.]

-*Aim musi być ponownie uruchomiony, aby opcje odniosły żądany efekt.

+[*Aim must be reconnected for some option to take effect]

+*Aim musi być ponownie uruchomiony, aby opcje odniosły żądany efekt

 [Connection]

 Połączenie

 [Port:]

diff --git a/langpacks/portuguese_br/=CORE=.txt b/langpacks/portuguese_br/=CORE=.txt
index 7c32f86633..e203b0d853 100644
--- a/langpacks/portuguese_br/=CORE=.txt
+++ b/langpacks/portuguese_br/=CORE=.txt
@@ -359,8 +359,6 @@ Reinicie o Miranda NG BR para que as alterações surtam efeito.
 Fontes e Cores

 [Undo]

 Desfazer

-[Undo]

-Desfazer

 [Reset]

 Limpar

 [Reset]

@@ -716,8 +714,6 @@ Abrir nova &janela de pesquisa
 &Abrir na janela atual do navegador

 [Message]

 Mensagem

-[Undo  ]

-Desfazer  

 [Redo]

 Refazer

 [Copy]

diff --git a/langpacks/portuguese_br/Plugins/AIM.txt b/langpacks/portuguese_br/Plugins/AIM.txt
index 0690fd15e9..f5e18eb089 100644
--- a/langpacks/portuguese_br/Plugins/AIM.txt
+++ b/langpacks/portuguese_br/Plugins/AIM.txt
@@ -40,8 +40,8 @@ Ficar inativo após ligado
 Força Proxy para Transferência de Arquivos

 [Masquerade as a Sidekick/Hiptop User]

 Perfil de usuário 'Hiptop'

-[*Aim must be reconnected  for some option to take effect.]

-* Objetivo deve ser restabelecido por alguma opção para fazer efeito.

+[*Aim must be reconnected for some option to take effect]

+* Objetivo deve ser restabelecido por alguma opção para fazer efeito

 [Port:]

 Porta:

 [Reset]

diff --git a/langpacks/russian/Plugins/AIM.txt b/langpacks/russian/Plugins/AIM.txt
index 3b5e9caf80..36e91560af 100644
--- a/langpacks/russian/Plugins/AIM.txt
+++ b/langpacks/russian/Plugins/AIM.txt
@@ -9,8 +9,8 @@
 ;============================================================

 [(seconds)]

 (секунды)

-[*Aim must be reconnected  for some option to take effect.]

-*AIM должен быть переподключён, чтобы изменения вступили в силу.

+[*Aim must be reconnected for some option to take effect]

+*AIM должен быть переподключён, чтобы изменения вступили в силу

 [AOL Instant Messenger (AIM) protocol support for Miranda NG.]

 Поддержка протокола AOL Instant Messenger (AIM) в Miranda NG.

 [AIM Account Setup]

@@ -428,10 +428,10 @@ AIM Журналы
 [Superscript]

 Суперскрипт

 [Not Superscript]

-Не супер скрипт

+Не суперскрипт

 [Normal Script]

 Стандартный скрипт

 [Not Normal Script]

-Не стандартный скрипт

-[*AimOSCAR must be reconnected  for some option to take effect.]

-*AimOSCAR должен быть переподключён для вступления в силу изменений.
\ No newline at end of file
+Нестандартный скрипт

+[Display Name:]

+Показыв. имя:
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/StatusChange.txt b/langpacks/russian/Plugins/StatusChange.txt
index 1e98c64beb..c0b42d3472 100644
--- a/langpacks/russian/Plugins/StatusChange.txt
+++ b/langpacks/russian/Plugins/StatusChange.txt
@@ -12,7 +12,7 @@
 [...change status to...]

 ...сменить статус на...

 [... if status is...]

-...если статус...                                                                                          

+...если статус...

 [Change status when you send/receive an event.]

 Меняет статус при получении или отправки события.

 [Status Change]

diff --git a/langpacks/slovak/=CORE=.txt b/langpacks/slovak/=CORE=.txt
index d20599fcdf..f008665d01 100644
--- a/langpacks/slovak/=CORE=.txt
+++ b/langpacks/slovak/=CORE=.txt
@@ -650,8 +650,6 @@ Zoznam
 

 [Message]

 

-[Undo  ]

-

 [Redo]

 

 [Copy]

diff --git a/langpacks/slovak/Plugins/AIM.txt b/langpacks/slovak/Plugins/AIM.txt
index efa042e2b6..18e6b86b1e 100644
--- a/langpacks/slovak/Plugins/AIM.txt
+++ b/langpacks/slovak/Plugins/AIM.txt
@@ -44,7 +44,7 @@ Rozšírené nastavenia
 

 [Masquerade as a Sidekick/Hiptop User]

 

-[*Aim must be reconnected  for some option to take effect.]

+[*Aim must be reconnected for some option to take effect]

 

 [Connection]

 

diff --git a/langpacks/slovak/Untranslated/=CORE=.txt b/langpacks/slovak/Untranslated/=CORE=.txt
index f77d535d4a..193507aa2c 100644
--- a/langpacks/slovak/Untranslated/=CORE=.txt
+++ b/langpacks/slovak/Untranslated/=CORE=.txt
@@ -195,7 +195,6 @@
 [Open a &new browser window]

 [&Open in current browser window]

 [Message]

-[Undo  ]

 [Redo]

 [Copy]

 [Cut]

diff --git a/langpacks/slovak/Untranslated/AIM.txt b/langpacks/slovak/Untranslated/AIM.txt
index 2705759be2..724e3a3ca4 100644
--- a/langpacks/slovak/Untranslated/AIM.txt
+++ b/langpacks/slovak/Untranslated/AIM.txt
@@ -14,7 +14,7 @@
 [Instant Idle on Login]

 [Force Proxy File Transfers]

 [Masquerade as a Sidekick/Hiptop User]

-[*Aim must be reconnected  for some option to take effect.]

+[*Aim must be reconnected for some option to take effect]

 [Connection]

 [Disable SSL]

 [Manage Server Groups]

diff --git a/langpacks/turkish/=CORE=.txt b/langpacks/turkish/=CORE=.txt
index 71fea8c485..cc227d1867 100644
--- a/langpacks/turkish/=CORE=.txt
+++ b/langpacks/turkish/=CORE=.txt
@@ -572,8 +572,6 @@ Ye&ni bir tarayıcı penceresi aç
 Geçerli &web tarayıcı penceresinde aç

 [Message]

 İleti

-[Undo  ]

-Geri Al 

 [Redo]

 Yeniden

 [Copy]

diff --git a/langpacks/turkish/Plugins/AIM.txt b/langpacks/turkish/Plugins/AIM.txt
index ac4e178e0b..a7a05a2902 100644
--- a/langpacks/turkish/Plugins/AIM.txt
+++ b/langpacks/turkish/Plugins/AIM.txt
@@ -36,8 +36,8 @@ Girişte Boşta Ol
 Vekil Dosya Aktarımını Dayat

 [Masquerade as a Sidekick/Hiptop User]

 Yadımcı Kişi Olarak Maskele

-[*Aim must be reconnected  for some option to take effect.]

-* Ayarların etkin olması için AIM'e yeniden bağlanmalısınız.

+[*Aim must be reconnected for some option to take effect]

+* Ayarların etkin olması için AIM'e yeniden bağlanmalısınız

 [Port:]

 Port:

 [Reset]

diff --git a/langpacks/ukrainian/plugins/Console.txt b/langpacks/ukrainian/plugins/Console.txt
index f269698a7c..e59c750c3c 100644
--- a/langpacks/ukrainian/plugins/Console.txt
+++ b/langpacks/ukrainian/plugins/Console.txt
@@ -46,9 +46,7 @@
 [Show console]

 Показать консоль

 [Show Console]

-Показать консоль

-[Console]                                    ]

-Консоль                                    

+Показать консоль                                  

 [Miranda Netlib Log]

 Журнал Miranda Netlib

 [Save log to file]

diff --git a/protocols/AimOscar/res/aim.rc b/protocols/AimOscar/res/aim.rc
index 46dc858991..125fba9787 100644
--- a/protocols/AimOscar/res/aim.rc
+++ b/protocols/AimOscar/res/aim.rc
@@ -58,7 +58,7 @@ BEGIN
     GROUPBOX        "AIM User Details",IDC_DETAILS,3,7,147,80,WS_GROUP

     LTEXT           "Screen Name:",IDC_STATIC,8,20,45,11

     EDITTEXT        IDC_SN,59,17,86,15,ES_LOWERCASE | ES_AUTOHSCROLL

-    LTEXT           "Display Name:",IDC_STATIC,5,39,48,9

+    LTEXT           "Display Name:",IDC_STATIC,6,39,51,9

     EDITTEXT        IDC_NK,59,37,86,15,ES_AUTOHSCROLL

     LTEXT           "Password:",IDC_STATIC,17,59,35,15

     EDITTEXT        IDC_PW,59,57,86,15,ES_PASSWORD | ES_AUTOHSCROLL

@@ -66,7 +66,7 @@ BEGIN
     EDITTEXT        IDC_HN,206,102,83,13,ES_AUTOHSCROLL

     GROUPBOX        "AIM Options",IDC_OPTIONS,3,89,147,120,WS_GROUP

     CONTROL         "Message Delivery Confirmation",IDC_DC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,99,130,13

-    CONTROL         "Do Not Autoreply When Away",IDC_DM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,111,134,13

+    CONTROL         "Do Not Autoreply When Away",IDC_DM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,111,139,13

     CONTROL         "Convert Incoming Messages to BBCode",IDC_FI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,123,137,13

     CONTROL         "Convert Outgoing Messages to HTML",IDC_FO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,135,136,13

     CONTROL         "Disable Avatars",IDC_DA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,147,136,13

@@ -77,7 +77,7 @@ BEGIN
     CONTROL         "Instant Idle on Login",IDC_II,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,18,131,15

     CONTROL         "Force Proxy File Transfers",IDC_FP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,31,130,11

     CONTROL         "Masquerade as a Sidekick/Hiptop User",IDC_HF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,42,135,13

-    LTEXT           "*Aim must be reconnected  for some option to take effect.",IDC_MASQ,171,169,115,18,NOT WS_VISIBLE

+    CTEXT           "*Aim must be reconnected for some option to take effect",IDC_MASQ,171,169,115,28,NOT WS_VISIBLE

     GROUPBOX        "Connection",IDC_STATIC,154,89,142,71

     EDITTEXT        IDC_PN,207,119,37,13,ES_AUTOHSCROLL

     LTEXT           "Port:",IDC_STATIC,158,121,44,12