26 files changed, 29 insertions, 33 deletions
diff --git a/langpacks/belarusian/Plugins/Clist_modern.txt b/langpacks/belarusian/Plugins/Clist_modern.txt
index 062c209fe2..74fd23122c 100644
--- a/langpacks/belarusian/Plugins/Clist_modern.txt
+++ b/langpacks/belarusian/Plugins/Clist_modern.txt
@@ -472,7 +472,7 @@
 Закругленыя аватары
 [Ignore size for row height calcs]
 Ігнараваць вышыню радка
-[Border Color:]
+[Border color:]
 Колер рамкі:
 [Custom corner size:]
 Памер кута:
diff --git a/langpacks/belarusian/Plugins/NewXstatusNotify.txt b/langpacks/belarusian/Plugins/NewXstatusNotify.txt
index 1945ac5b5e..b89916e96e 100644
--- a/langpacks/belarusian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/belarusian/Plugins/NewXstatusNotify.txt
@@ -102,7 +102,7 @@
 Паказваць папярэдні cтатус
 [Timeout]
 Таймаўт
-[Popups on contact status change to:]
+[Popups when status changes to:]
 Вокны, калі статус змяніўся на:
 [Click action]
 Дзеянні па пстрычцы
diff --git a/langpacks/bulgarian/Plugins/Clist_modern.txt b/langpacks/bulgarian/Plugins/Clist_modern.txt
index eafd934fc6..86e29c7e7b 100644
--- a/langpacks/bulgarian/Plugins/Clist_modern.txt
+++ b/langpacks/bulgarian/Plugins/Clist_modern.txt
@@ -186,7 +186,7 @@ MetaContacts - настройки
 Наслагване на икони
 [Round corners of avatars]
 Закръглени ъгли на аватарите
-[Border Color:]
+[Border color:]
 Рамка (цвят):
 [Normal overlay icon]
 Нормална икона за наслагване
diff --git a/langpacks/bulgarian/Plugins/NewXstatusNotify.txt b/langpacks/bulgarian/Plugins/NewXstatusNotify.txt
index 9249a91a60..b51fc99bd4 100644
--- a/langpacks/bulgarian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/bulgarian/Plugins/NewXstatusNotify.txt
@@ -36,7 +36,7 @@
 Показване на текста за състояние
 [Show previous status too]
 Показване и на предишното състояние
-[Popups on contact status change to:]
+[Popups when status changes to:]
 При променено състояние на:
 [Show contact group name]
 Показване на групата (в която е контакта)
diff --git a/langpacks/chinese/Plugins/Clist_modern.txt b/langpacks/chinese/Plugins/Clist_modern.txt
index fc82629f03..f7f1e00b30 100644
--- a/langpacks/chinese/Plugins/Clist_modern.txt
+++ b/langpacks/chinese/Plugins/Clist_modern.txt
@@ -198,7 +198,7 @@ x100 毫秒
 头像圆边
 [Ignore size for row height calcs]
 忽略计算列高
-[Border Color:]
+[Border color:]
 背景颜色: 
 [Normal overlay icon]
 标准层叠图标
diff --git a/langpacks/czech/Plugins/Clist_modern.txt b/langpacks/czech/Plugins/Clist_modern.txt
index 5638aa8bae..fda62c6cae 100644
--- a/langpacks/czech/Plugins/Clist_modern.txt
+++ b/langpacks/czech/Plugins/Clist_modern.txt
@@ -478,7 +478,7 @@ Překrývat upřesňujícími ikonami
 Zaoblit rohy avatarů
 [Ignore size for row height calcs]
 Ignorovat vypočtenou výšku řádku
-[Border Color:]
+[Border color:]
 Barva rámečku:
 [Custom corner size:]
 Velikost zakulacení:
diff --git a/langpacks/dutch/Plugins/Clist_modern.txt b/langpacks/dutch/Plugins/Clist_modern.txt
index efde8bf44c..8336635b29 100644
--- a/langpacks/dutch/Plugins/Clist_modern.txt
+++ b/langpacks/dutch/Plugins/Clist_modern.txt
@@ -108,7 +108,7 @@ Overlay iconen tekenen
 Hoeken van avatars afronden
 [Ignore size for row height calcs]
 Grootte voor rij hoogte berekeningen negeren
-[Border Color:]
+[Border color:]
 Rand kleur:
 [Normal overlay icon]
 Normaal overlay icoon
diff --git a/langpacks/french/Plugins/Clist_modern.txt b/langpacks/french/Plugins/Clist_modern.txt
index c1f5a12e6e..d2ebb5f3ca 100644
--- a/langpacks/french/Plugins/Clist_modern.txt
+++ b/langpacks/french/Plugins/Clist_modern.txt
@@ -172,7 +172,7 @@ Superposer l'icône d'état
 Arrondir les coins des avatars
 [Ignore size for row height calcs]
 Ignorer cette dimension pour la hauteur des lignes
-[Border Color:]
+[Border color:]
 Coul. bordures :
 [Normal overlay icon]
 Icône normal overlay
diff --git a/langpacks/german/Plugins/Clist_modern.txt b/langpacks/german/Plugins/Clist_modern.txt
index 1326e49abe..06606c3596 100644
--- a/langpacks/german/Plugins/Clist_modern.txt
+++ b/langpacks/german/Plugins/Clist_modern.txt
@@ -478,7 +478,7 @@ Avatare mit Icons überlagern
 Avatarecken abrunden
 [Ignore size for row height calcs]
 Höhe für Höhenanpassung ignorieren
-[Border Color:]
+[Border color:]
 Randfarbe:
 [Custom corner size:]
 Radius:
diff --git a/langpacks/german/Plugins/NewXstatusNotify.txt b/langpacks/german/Plugins/NewXstatusNotify.txt
index b699a9a029..af143c8f1d 100644
--- a/langpacks/german/Plugins/NewXstatusNotify.txt
+++ b/langpacks/german/Plugins/NewXstatusNotify.txt
@@ -106,8 +106,8 @@ Statusnachricht lesen
 Vorherigen Status ebenfalls anzeigen
 [Timeout]
 Timeout
-[Popups on contact status change to:]
-Popup, wenn Kontakt Status ändert in:
+[Popups when status changes to:]
+Popup, wenn Status ändert in:
 [Click action]
 Aktion bei Klick
 [Show contact group name]
diff --git a/langpacks/hebrew/Plugins/Clist_modern.txt b/langpacks/hebrew/Plugins/Clist_modern.txt
index bb47eb649a..978a37b61b 100644
--- a/langpacks/hebrew/Plugins/Clist_modern.txt
+++ b/langpacks/hebrew/Plugins/Clist_modern.txt
@@ -162,7 +162,7 @@ x100 מילי שניות
 עגל פינות של אוואטרים
 [Ignore size for row height calcs]
 התעלם מגודל בשביל שורה גובה מחשבון
-[Border Color:]
+[Border color:]
 צבע גבול:
 [Normal overlay icon]
 אייקון פרוש רגיל
diff --git a/langpacks/hungarian/Plugins/Clist_modern.txt b/langpacks/hungarian/Plugins/Clist_modern.txt
index 60deaac841..0a60db7fec 100644
--- a/langpacks/hungarian/Plugins/Clist_modern.txt
+++ b/langpacks/hungarian/Plugins/Clist_modern.txt
@@ -178,7 +178,7 @@ Ikonok felugró buborékban
 Avatarok sarkainak lekerekítése
 [Ignore size for row height calcs]
 Sormagasság számítások mérete nem számít
-[Border Color:]
+[Border color:]
 Keretszín:
 [Normal overlay icon]
 Sima felsõlap ikon
diff --git a/langpacks/japanese/Plugins/Clist_modern.txt b/langpacks/japanese/Plugins/Clist_modern.txt
index 99e1437f33..76530cb7da 100644
--- a/langpacks/japanese/Plugins/Clist_modern.txt
+++ b/langpacks/japanese/Plugins/Clist_modern.txt
@@ -196,7 +196,7 @@ Aero Glass (Vista) を有効
 アバターの角を丸める
 [Ignore size for row height calcs]
 行の高さの演算結果を無視する
-[Border Color:]
+[Border color:]
 枠線の色 :
 [Normal overlay icon]
 標準オーバーレイアイコン
diff --git a/langpacks/norwegian/Plugins/Clist_modern.txt b/langpacks/norwegian/Plugins/Clist_modern.txt
index a2fa3ab950..8299e75be2 100644
--- a/langpacks/norwegian/Plugins/Clist_modern.txt
+++ b/langpacks/norwegian/Plugins/Clist_modern.txt
@@ -150,7 +150,7 @@ Tegn overlappende ikoner
 Runde hjørner på avatarer
 [Ignore size for row height calcs]
 Ignorer størrelse ved utregning av radhøyde
-[Border Color:]
+[Border color:]
 Rammefarge:
 [Normal overlay icon]
 Vanlig overlappende ikon
diff --git a/langpacks/norwegian/Plugins/NewXstatusNotify.txt b/langpacks/norwegian/Plugins/NewXstatusNotify.txt
index 9aab00e8b0..80b9609e17 100644
--- a/langpacks/norwegian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/norwegian/Plugins/NewXstatusNotify.txt
@@ -24,7 +24,7 @@ Bruk Popupfarger
 Les statusmelding
 [Show previous status too]
 Vis tidligere status også
-[Popups on contact status change to:]
+[Popups when status changes to:]
 Popups når kontakten endrer til:
 [Show contact group name]
 Vis kontakt gruppenavn
diff --git a/langpacks/polish/Plugins/Clist_modern.txt b/langpacks/polish/Plugins/Clist_modern.txt
index 8a6afe7de5..ef5222f67b 100644
--- a/langpacks/polish/Plugins/Clist_modern.txt
+++ b/langpacks/polish/Plugins/Clist_modern.txt
@@ -637,7 +637,7 @@ Rysuj nakładki ikon
 Zaokrąglone rogi awatarów
 [Ignore size for row height calcs]
 Ignoruj wysokość wiersza
-[Border Color:]
+[Border color:]
 Kolor ramki:
 [Custom corner size:]
 Rozmiar rogów:
diff --git a/langpacks/polish/Plugins/NewXstatusNotify.txt b/langpacks/polish/Plugins/NewXstatusNotify.txt
index 0c87fa7138..d10310ae2e 100644
--- a/langpacks/polish/Plugins/NewXstatusNotify.txt
+++ b/langpacks/polish/Plugins/NewXstatusNotify.txt
@@ -119,7 +119,7 @@ Użyj indywidualnych dźwięków
 Użyj ikon statusu
 [Individual sounds are disabled.\n\nTo enable them, go to Options -  Status - Notify, enable \n\"Use individual sounds\" checkbox, and then reopen this dialog.]
 Indywidualne dźwięki są wyłączone.\n\nAby je aktywować, idź do Opcje -> Status -> Powiadamianie, włącz\nopcję "Użyj indywidualnych dźwięków" i wróć tutaj.
-[Popups on contact status change to:]
+[Popups when status changes to:]
 Pokazuj po zmianie statusu na:
 [Popup title]
 Tytuł popupu
diff --git a/langpacks/portuguese_br/Plugins/Clist_modern.txt b/langpacks/portuguese_br/Plugins/Clist_modern.txt
index 73cb29eea1..6703951feb 100644
--- a/langpacks/portuguese_br/Plugins/Clist_modern.txt
+++ b/langpacks/portuguese_br/Plugins/Clist_modern.txt
@@ -360,10 +360,8 @@ Cantos arrendados do avatar
 Ignorar tamanho para calcular altura da linha
 [Ignore size for row height calcs]
 Ignorar tamanho para calcular altura da linha
-[Border Color:]
+[Border color:]
 Cor da Borda:
-[Border Color:]
-Cor da Bord:
 [Normal overlay icon]
 Ícone normal de sobreposição
 [Normal overlay icon]
@@ -384,8 +382,6 @@ altura
 Largura máxima
 [Use old render method (fast, but has artefacts)]
 Use velho método render (fast, mas tem artefatos)
-[Use old render method (Fast, but has artefacts)]
-Use velho método render (Melhor, mas tem artefatos)
 [Hide icon when showing avatar]
 Ocultar ícone quando mostrando avatar
 [Hide icon when showing avatar]
diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt
index 7def26345e..0b2f37ca2e 100644
--- a/langpacks/russian/Plugins/Clist_modern.txt
+++ b/langpacks/russian/Plugins/Clist_modern.txt
@@ -257,7 +257,7 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
 Старый метод отрисовки (быстрее, но могут быть "артефакты")
 [Draw border on avatar]
 Рамки на аватарах
-[Border Color:]
+[Border color:]
 Цвет рамки:
 [Round corners of avatars]
 Закруглённые аватары
diff --git a/langpacks/russian/Plugins/GG.txt b/langpacks/russian/Plugins/GG.txt
index 8743581917..d8fd941a8d 100644
--- a/langpacks/russian/Plugins/GG.txt
+++ b/langpacks/russian/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: gg.dll
 ;  Module: Gadu-Gadu protocol
-;  Versions: 0.10.0.2
+;  Versions: 0.10.0.3
 ;  URL: http://code.google.com/p/miranda/downloads/list
 ;  Source: http://miranda.googlecode.com/svn/trunk/miranda/protocols/Gadu-Gadu/
 ;  Authors: dezred
diff --git a/langpacks/russian/Plugins/Skype.txt b/langpacks/russian/Plugins/Skype.txt
index b4cf0e8b0d..ca9186cd8a 100644
--- a/langpacks/russian/Plugins/Skype.txt
+++ b/langpacks/russian/Plugins/Skype.txt
@@ -266,7 +266,7 @@ Skype протокол
 [Unblock this person...]
 Разблокировать пользователя...
 [Remove from your Contact List]
-Удалить из контактного листа
+Удалить из списка контактов
 [Abuse]
 Нарушение
 [You can also report abuse from this user.]
diff --git a/langpacks/spanish/Plugins/Clist_modern.txt b/langpacks/spanish/Plugins/Clist_modern.txt
index 94527b2931..c68996ee49 100644
--- a/langpacks/spanish/Plugins/Clist_modern.txt
+++ b/langpacks/spanish/Plugins/Clist_modern.txt
@@ -194,7 +194,7 @@ Dibuje los iconos sobreimpresionados
 Ronda de las esquinas de los avatares
 [Ignore size for row height calcs]
 Ignorar el tamaño de calculadoras altura de la fila
-[Border Color:]
+[Border color:]
 color de borde
 [Normal overlay icon]
 Normal icono sobreimpresionado
diff --git a/langpacks/spanish/Plugins/NewXstatusNotify.txt b/langpacks/spanish/Plugins/NewXstatusNotify.txt
index 104484d369..ffd3a9edc0 100644
--- a/langpacks/spanish/Plugins/NewXstatusNotify.txt
+++ b/langpacks/spanish/Plugins/NewXstatusNotify.txt
@@ -36,7 +36,7 @@ Habilitar todas las
 Utilice colores Popup
 [Read status message]
 Lea el mensaje de estado
-[Popups on contact status change to:]
+[Popups when status changes to:]
 Pop-ups en el cambio de estado en contacto con:
 [Show contact group name]
 Mostrar el nombre del grupo de contacto
diff --git a/langpacks/turkish/Plugins/Clist_modern.txt b/langpacks/turkish/Plugins/Clist_modern.txt
index 5c46bb0a60..493684fa29 100644
--- a/langpacks/turkish/Plugins/Clist_modern.txt
+++ b/langpacks/turkish/Plugins/Clist_modern.txt
@@ -178,7 +178,7 @@ Simgeleri üstüne yerleştir
 Avatar köşelerini yuvarlat
 [Ignore size for row height calcs]
 Satır yüksekliği hesapları için boyutu yoksay
-[Border Color:]
+[Border color:]
 Sınır Rengi:
 [Normal overlay icon]
 Normal üstüste simgesi
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index a621145659..db176538f0 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -301,7 +301,7 @@ BEGIN
     CONTROL         "",IDC_OFFSETSPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,114,72,10,12
     EDITTEXT        IDC_SBAR_BORDER_BOTTOM,73,88,30,12,ES_AUTOHSCROLL
     CONTROL         "",IDC_SBAR_BORDER_BOTTOM_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,93,88,10,12
-    RTEXT           "Vertical Align",IDC_STATIC,27,109,61,10
+    RTEXT           "Vertical Align",IDC_STATIC,27,110,61,10
     COMBOBOX        IDC_SBAR_VERT_ALIGN,93,108,48,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Horizontal Align",IDC_STATIC,27,124,61,10
     COMBOBOX        IDC_SBAR_HORIZ_ALIGN,93,123,48,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -393,7 +393,7 @@ BEGIN
     CONTROL         "Hide contact list after ",IDC_AUTOHIDE,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,11,34,94,10
     EDITTEXT        IDC_HIDETIME,108,33,31,12,ES_RIGHT | ES_NUMBER
     CONTROL         "Spin1",IDC_HIDETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,133,32,9,14
-    LTEXT           "seconds",IDC_STATIC01,140,35,35,8
+    LTEXT           "seconds",IDC_STATIC01,142,35,35,8
     CONTROL         "Automatically resize window to height of list",IDC_AUTOSIZE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,113,240,12,WS_EX_TRANSPARENT
     LTEXT           "maximum",IDC_STATIC21,19,128,38,8
@@ -644,7 +644,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,80,246,8
     CONTROL         "Ignore size for row height calcs",IDC_AVATAR_IGNORE_SIZE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,246,8
-    LTEXT           "Border Color:",IDC_AVATAR_BORDER_COLOR_L,20,64,53,10
+    RTEXT           "Border color:",IDC_AVATAR_BORDER_COLOR_L,20,64,53,10
     CONTROL         "",IDC_AVATAR_BORDER_COLOR,"ColourPicker",WS_TABSTOP,77,62,17,13
     CONTROL         "Custom corner size:",IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,92,78,11
diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc
index cac91db5c5..90d1c1e05a 100644
--- a/protocols/JabberG/res/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -124,7 +124,7 @@ BEGIN
     CONTROL         "Manually specify connection host",IDC_MANUAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,134,223,10
     RTEXT           "Host:",IDC_STATIC,26,147,30,8
     EDITTEXT        IDC_HOST,57,145,90,12,ES_AUTOHSCROLL | WS_DISABLED
-    RTEXT           "Port:",IDC_STATIC,156,148,27,8
+    RTEXT           "Port:",IDC_STATIC,156,147,27,8
     EDITTEXT        IDC_HOSTPORT,186,145,31,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
     CONTROL         "Keep connection alive",IDC_KEEPALIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,158,221,10
     CONTROL         "Automatically delete contacts not in my roster",IDC_ROSTER_SYNC,