VKontakte:

-Fixed a typo

german langpack:
-Updated  VKontakte and PluginUpdater

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

5 files changed, 45 insertions, 57 deletions

diff --git a/langpacks/german/Plugins/PluginUpdater.txt b/langpacks/german/Plugins/PluginUpdater.txt
index 56c89bb276..3f9cd98af7 100644
--- a/langpacks/german/Plugins/PluginUpdater.txt
+++ b/langpacks/german/Plugins/PluginUpdater.txt
@@ -131,11 +131,11 @@ Wird gelöscht!
 [Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit.]

 Aktualisierung abgeschlossen. Klicken Sie auf Ja, um Miranda neu zu starten, oder auf Nein, um einen Neustart nach dem Beenden zu machen.

 [Miranda NG Core]

-

+Miranda-NG-Kern

 [Deprecated!]

-

+Veraltet!

 [Update found!]

-Update gefunden!

+Aktualisierung gefunden!

 [<< Details]

 << Details

 [Update failed! One of the components wasn't downloaded correctly. Try it again later.]

diff --git a/langpacks/german/Plugins/VKontakte.txt b/langpacks/german/Plugins/VKontakte.txt
index aebf7a6fd5..437ba24187 100644
--- a/langpacks/german/Plugins/VKontakte.txt
+++ b/langpacks/german/Plugins/VKontakte.txt
@@ -21,9 +21,9 @@ Chats beim Start verbergen
 [Always notify as unread for all incoming message]

 Alle eingehenden Nachrichten immer als ungelesen benachrichtigen

 [Add [img] bbc for graphical attachments]

-

+BBCode [img] für grafische Anhänge verwenden

 [Force online status upon user activity]

-

+Onlinestatus bei Aktivität des Benutzers erzwingen

 [When I ban user...]

 Wenn ich einen Benutzer banne...

 [Report abuse]

@@ -34,10 +34,10 @@ Serververlauf löschen
 Aus Freundesliste entfernen

 [Remove from contact list]

 Aus Kontaktliste entfernen

-[Process stickers as smiles]

-

+[Process stickers as smileys]

+Sticker als Snileys darstellen

 [Login settings]

-Login-Einstellungen

+Anmeldeeinstellungen

 [Local settings]

 Lokale Einstellungen

 [Contact list group:]

@@ -51,15 +51,15 @@ Letzte Nachrichten automatisch synchronisieren
 [Automatically wipe local contacts missing in your friend list]

 Lokale Kontakte, die nicht in Ihrer Freundesliste sind, automatisch löschen

 [Mark message as read...]

-

+Nachricht als gelesen markieren...

 [on read]

-

+Beim Lesen

 [on receive]

-

+Beim Empfangen

 [on reply]

-

+Beim Antworten

 [on typing]

-

+Beim Tippen

 [Bots challenge test]

 Bot-Challenge-Test

 [Instruction:]

@@ -86,21 +86,21 @@ Fehler
 [Captcha form icon]

 Captcha Form. Icon

 [Notification icon]

-

+Benachrichtigungsicon

 [Read message icon]

-

+Nachricht-gelesen-Icon

 [Visit profile icon]

-

+Profil-besuchen-Icon

 [Load server history icon]

-

+Servervarlauf-laden-Icon

 [Add to friendlist icon]

-

+Zu-Freundesliste-hinzufügen-Icon

 [Delete from friendlist icon]

-

+Von-Freundesliste-löschen-Icon

 [Report abuse icon]

-

+Missbrauch-melden-Icon

 [Ban user icon]

-

+Benutzer-bannen-Icon

 [Protocols]

 Protokolle

 [VKontakte]

diff --git a/langpacks/german/Untranslated/PluginUpdater.txt b/langpacks/german/Untranslated/PluginUpdater.txt
deleted file mode 100644
index c9855b2944..0000000000
--- a/langpacks/german/Untranslated/PluginUpdater.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[Miranda NG Core]

-[Deprecated!]

diff --git a/langpacks/german/Untranslated/VKontakte.txt b/langpacks/german/Untranslated/VKontakte.txt
deleted file mode 100644
index e837929ca7..0000000000
--- a/langpacks/german/Untranslated/VKontakte.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-[Add [img] bbc for graphical attachments]

-[Force online status upon user activity]

-[Process stickers as smiles]

-[Mark message as read...]

-[on read]

-[on receive]

-[on reply]

-[on typing]

-[Notification icon]

-[Read message icon]

-[Visit profile icon]

-[Load server history icon]

-[Add to friendlist icon]

-[Delete from friendlist icon]

-[Report abuse icon]

-[Ban user icon]

diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc
index 9db394c0d6..c22183240c 100644
--- a/protocols/VKontakte/res/resource.rc
+++ b/protocols/VKontakte/res/resource.rc
@@ -12,7 +12,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS

 

 /////////////////////////////////////////////////////////////////////////////

-// Ðóññêèé (Ðîññèÿ) resources

+// Russian (Russia) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

@@ -34,12 +34,12 @@ IDI_ABUSE               ICON                    "report.ico"
 IDI_VISITPROFILE        ICON                    "home.ico"

 IDI_HISTORY             ICON                    "history.ico"

 IDI_KEYS                ICON                    "key.ico"

-#endif    // Ðóññêèé (Ðîññèÿ) resources

+#endif    // Russian (Russia) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

 /////////////////////////////////////////////////////////////////////////////

-// Àíãëèéñêèé (ÑØÀ) resources

+// English (United States) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

@@ -71,8 +71,14 @@ BEGIN
     BEGIN

         LEFTMARGIN, 4

         RIGHTMARGIN, 297

+        VERTGUIDE, 12

+        VERTGUIDE, 150

+        VERTGUIDE, 155

+        VERTGUIDE, 162

+        VERTGUIDE, 167

+        VERTGUIDE, 288

         TOPMARGIN, 7

-        BOTTOMMARGIN, 188

+        BOTTOMMARGIN, 177

     END

 

     IDD_INVITE, DIALOG

@@ -130,23 +136,23 @@ BEGIN
     CONTROL         "Remove from friend list",IDC_REMOVE_FROM_FRENDLIST,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,101,129,10

     CONTROL         "Remove from contact list",IDC_REMOVE_FROM_CLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,112,129,10

-    CONTROL         "Process stickers as smiles",IDC_STICKERS_AS_SMYLES,

+    CONTROL         "Process stickers as smileys",IDC_STICKERS_AS_SMYLES,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,52,278,10

 END

 

-IDD_OPT_MAIN DIALOGEX 0, 0, 304, 199

+IDD_OPT_MAIN DIALOGEX 0, 0, 304, 188

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     GROUPBOX        "Login settings",IDC_STATIC,4,8,293,50

-    LTEXT           "E-mail or phone number:",IDC_STATIC,35,16,108,10

-    EDITTEXT        IDC_LOGIN,147,15,89,12,ES_AUTOHSCROLL

-    LTEXT           "Password:",IDC_STATIC,35,28,108,10

-    EDITTEXT        IDC_PASSWORD,147,28,90,12,ES_PASSWORD | ES_AUTOHSCROLL

+    RTEXT           "E-mail or phone number:",IDC_STATIC,12,16,150,10

+    EDITTEXT        IDC_LOGIN,167,15,121,12,ES_AUTOHSCROLL

+    RTEXT           "Password:",IDC_STATIC,4,28,158,10

+    EDITTEXT        IDC_PASSWORD,167,28,121,12,ES_PASSWORD | ES_AUTOHSCROLL

     CONTROL         "Open VKontakte site",IDC_URL,"Hyperlink",WS_TABSTOP,59,43,174,11

-    GROUPBOX        "Local settings",IDC_STATIC,4,59,293,83

-    LTEXT           "Contact list group:",IDC_STATIC,12,71,146,8

+    GROUPBOX        "Local settings",IDC_STATIC,4,59,293,77

+    RTEXT           "Contact list group:",IDC_STATIC,12,71,150,8

     EDITTEXT        IDC_GROUPNAME,167,69,121,12,ES_AUTOHSCROLL

     CONTROL         "Server-side delivery confirmation",IDC_DELIVERY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,88,278,10

     CONTROL         "Use local time for received messages",IDC_USE_LOCAL_TIME,

@@ -155,11 +161,11 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,110,278,10

     CONTROL         "Automatically wipe local contacts missing in your friend list",IDC_AUTOCLEAN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,121,278,10

-    GROUPBOX        "Mark message as read...",IDC_STATIC_MARK_AS_READ,4,146,293,33,WS_GROUP

-    CONTROL         "on read",IDC_ONREAD,"Button",BS_AUTORADIOBUTTON,12,156,129,10

-    CONTROL         "on receive",IDC_ONRECEIVE,"Button",BS_AUTORADIOBUTTON,12,167,129,10

-    CONTROL         "on reply",IDC_ONREPLY,"Button",BS_AUTORADIOBUTTON,155,156,129,10

-    CONTROL         "on typing",IDC_ONTYPING,"Button",BS_AUTORADIOBUTTON,155,167,129,10

+    GROUPBOX        "Mark message as read...",IDC_STATIC_MARK_AS_READ,4,140,293,33,WS_GROUP

+    CONTROL         "on read",IDC_ONREAD,"Button",BS_AUTORADIOBUTTON,12,151,138,10

+    CONTROL         "on receive",IDC_ONRECEIVE,"Button",BS_AUTORADIOBUTTON,12,161,138,10

+    CONTROL         "on reply",IDC_ONREPLY,"Button",BS_AUTORADIOBUTTON,155,151,133,10

+    CONTROL         "on typing",IDC_ONTYPING,"Button",BS_AUTORADIOBUTTON,155,161,133,10

 END

 

 IDD_CAPTCHAFORM DIALOGEX 0, 0, 258, 224

@@ -228,7 +234,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Àíãëèéñêèé (ÑØÀ) resources

+#endif    // English (United States) resources

 /////////////////////////////////////////////////////////////////////////////