7 files changed, 25 insertions, 27 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 73e2a8a990..dc842c438d 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -218,7 +218,7 @@
 [This font is used to display various addtional notes.]
 [Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options. Alternatively, just click on the "New" button underneath the list to set up a new IM account.]
 [Event icon legend:]
-[Choose events you wish to ingonre:]
+[Choose events you wish to ignore:]
 [Font Effect]
 [Effect:]
 [Base colour:]
@@ -3622,7 +3622,7 @@
 [Round corners]
 [Non-layered mode]
 [Disable Skin Engine]
-[Enable Aero Glass (Vista)]
+[Enable Aero Glass (Vista+)]
 [Order of items:]
 [Min row height:]
 [Row border:]
@@ -8787,7 +8787,7 @@
 ;============================================================
 ;  File: Jabber.dll
 ;  Plugin: Jabber Protocol
-;  Version: 0.11.0.2
+;  Version: 0.11.0.3
 ;  Authors: George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura
 ;============================================================
 [Jabber protocol support for Miranda NG.]
@@ -10083,7 +10083,7 @@
 #muuid {a5bb1b7a-b7cd-4cbb-a7db-ceb4eb71da49}
 ;============================================================
 ;  File: KeepStatus.dll
-;  Plugin: Keep Status
+;  Plugin: Keep status
 ;  Version: 0.8.0.97
 ;  Authors: P Boon
 ;============================================================
@@ -10218,19 +10218,19 @@
 [TriggerData]
 [Status: The status the account will change to\r\nAccount: The account changing state]
 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp
-[KeepStatus]
-[%s Connected from another location]
-[%s Login error, cancel reconnecting]
-[%s Login error (next retry (%d) in %ds)]
-[%s Status error (next retry (%d) in %ds)]
-[Status error (next retry (%d) in %ds)]
+[%s connected from another location]
+[%s login error, cancel reconnecting]
+[%s login error (next retry (%d) in %d s)]
+[%s status error (next retry (%d) in %d s)]
+[Status error (next retry (%d) in %d s)]
 [will be set to]
 [Resetting status... (last try (%d))%s]
-[Resetting status... (next retry (%d) in %ds)%s]
+[Resetting status... (next retry (%d) in %d s)%s]
 [No internet connection seems available... (last try (%d))]
-[No internet connection seems available... (next retry (%d) in %ds)]
+[No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
+[KeepStatus]
 ;file \plugins\StatusPlugins\KeepStatus\options.cpp
 [Protocol]
 [Basic]
@@ -11902,7 +11902,6 @@
 [&Export]
 [&Close]
 [Import from:]
-[Load]
 [Feeds to be imported:]
 [&Import]
 ;file \plugins\NewsAggregator\Src\Authentication.cpp
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 5c952c8f2a..9752427ca8 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -225,7 +225,7 @@
 [Round corners]
 [Non-layered mode]
 [Disable Skin Engine]
-[Enable Aero Glass (Vista)]
+[Enable Aero Glass (Vista+)]
 [Order of items:]
 [Min row height:]
 [Row border:]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 5a4772a129..0ae064c90f 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Jabber.dll
 ;  Plugin: Jabber Protocol
-;  Version: 0.11.0.2
+;  Version: 0.11.0.3
 ;  Authors: George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura
 ;============================================================
 [Jabber protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 25e269820d..8e071f3f59 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -1,7 +1,7 @@
 #muuid {a5bb1b7a-b7cd-4cbb-a7db-ceb4eb71da49}
 ;============================================================
 ;  File: KeepStatus.dll
-;  Plugin: Keep Status
+;  Plugin: Keep status
 ;  Version: 0.8.0.97
 ;  Authors: P Boon
 ;============================================================
@@ -136,19 +136,19 @@
 [TriggerData]
 [Status: The status the account will change to\r\nAccount: The account changing state]
 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp
-[KeepStatus]
-[%s Connected from another location]
-[%s Login error, cancel reconnecting]
-[%s Login error (next retry (%d) in %ds)]
-[%s Status error (next retry (%d) in %ds)]
-[Status error (next retry (%d) in %ds)]
+[%s connected from another location]
+[%s login error, cancel reconnecting]
+[%s login error (next retry (%d) in %d s)]
+[%s status error (next retry (%d) in %d s)]
+[Status error (next retry (%d) in %d s)]
 [will be set to]
 [Resetting status... (last try (%d))%s]
-[Resetting status... (next retry (%d) in %ds)%s]
+[Resetting status... (next retry (%d) in %d s)%s]
 [No internet connection seems available... (last try (%d))]
-[No internet connection seems available... (next retry (%d) in %ds)]
+[No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
+[KeepStatus]
 ;file \plugins\StatusPlugins\KeepStatus\options.cpp
 [Protocol]
 [Basic]
diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index e01caa3a9d..70ab52e3ef 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -38,7 +38,6 @@
 [&Export]
 [&Close]
 [Import from:]
-[Load]
 [Feeds to be imported:]
 [&Import]
 ;file \plugins\NewsAggregator\Src\Authentication.cpp
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index e985b84a9d..4085f41cf9 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -355,7 +355,7 @@ ANSI плагин
 Сменить статус на:
 [Check for Update]
 Проверить обновления
-[Choose events you wish to ingonre:]
+[Choose events you wish to ignore:]
 Следующие события будут проигнорированы:
 [Choose Font]
 Шрифт
diff --git a/src/resource.rc b/src/resource.rc
index a642748766..c1c3e5e57d 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -687,7 +687,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL         "",IDC_LIST,"CListControl",WS_TABSTOP | 0x3da,10,13,358,135,WS_EX_CLIENTEDGE
     LTEXT           "Event icon legend:",IDC_TXT_TITLE2,0,153,119,8
-    LTEXT           "Choose events you wish to ingonre:",IDC_TXT_TITLE1,0,0,246,8
+    LTEXT           "Choose events you wish to ignore:",IDC_TXT_TITLE1,0,0,246,8
     CONTROL         "",IDC_LV_LEGEND,"SysListView32",LVS_LIST | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,10,166,358,43
 END