langpacks: update according to [11499]

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

2 files changed, 98 insertions, 31 deletions

diff --git a/langpacks/french/Plugins/VKontakte.txt b/langpacks/french/Plugins/VKontakte.txt
index c948d7b9cb..981f7c2e51 100644
--- a/langpacks/french/Plugins/VKontakte.txt
+++ b/langpacks/french/Plugins/VKontakte.txt
@@ -2,12 +2,24 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.0.27

+;  Version: 0.1.0.32

 ;  Authors: Miranda NG Team

 ;============================================================

 [VKontakte protocol support for Miranda NG.]

 Support du protocole VKontakte pour Miranda NG.

 ;file \protocols\VKontakte\res\resource.rc

+[News and event notifications]

+

+[WARNING: Causes excessive network traffic!!!]

+

+[Enable news feeds]

+

+[Enable event notifications]

+

+[BBCode support on news and event notifications]

+

+[Interval for updates (min):]

+

 [E-mail or phone number:]

 

 [Password:]

@@ -56,8 +68,6 @@ Avancé
 

 [Use local time for received messages]

 Utiliser l'heure locale pour les messages reçus

-[Automatically sync last messages]

-

 [Automatically wipe local contacts missing in your friend list]

 

 [Mark message as read...]

@@ -70,6 +80,14 @@ Utiliser l'heure locale pour les messages reçus
 

 [on typing]

 

+[Sync history on protocol online...]

+

+[automatically]

+

+[for last 1 day]

+

+[for last 3 days]

+

 [Bots challenge test]

 

 [Instruction:]

@@ -153,6 +171,35 @@ Avertissement
 &Détails contact

 [&Kick]

 

+;file \protocols\VKontakte\src\vk_feed.cpp

+[Photo]

+Photo

+[User was tagged in these photos:]

+

+[News from %s%s%s (%s)\n%s]

+

+[\tRepost from %s%s%s (%s)\n%s]

+

+[\nNews link: %s]

+

+[%s%s%s (%s) commented %%s\n%s]

+

+[%s%s%s (%s) posted %%s\n%s]

+

+[liked your]

+

+[shared your]

+

+[photo]

+photo

+[Link]

+Lien

+[video]

+video

+[post]

+

+[topic]

+sujet

 ;file \protocols\VKontakte\src\vk_files.cpp

 [Couldn't save file]

 

@@ -174,11 +221,18 @@ Avertissement
 

 [File upload error]

 

+;file \protocols\VKontakte\src\vk_history.cpp

+[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]

+

+[Attention!]

+

 ;file \protocols\VKontakte\src\vk_options.cpp

 [Network]

 Réseau

 [Account]

 Compte

+[News and notifications]

+

 ;file \protocols\VKontakte\src\vk_proto.cpp

 [%s server connection]

 %s serveur connexion

@@ -186,8 +240,6 @@ Compte
 

 [Visit profile]

 Visiter le profil

-[Reload all messages from vk.com]

-

 [Add as friend]

 

 [Delete from friend list]

@@ -198,6 +250,16 @@ Visiter le profil
 

 [Open broadcast]

 

+[Reload messages from vk.com...]

+

+[for last week]

+

+[for last 30 days]

+

+[for last 90 days]

+

+[for all time]

+

 [Errors]

 Erreurs

 [Notification]

@@ -211,22 +273,10 @@ Erreurs
 [Cannot add this user to friends as you put him on blacklist]

 

 ;file \protocols\VKontakte\src\vk_thread.cpp

-[Start sync history]

-

-[Sync history]

-

-[Sync history complete]

-

-[History import is complete]

-

-[History import]

-

 [Please authorize me to add you to my friend list.]

 

 [Are you sure to delete %s from your friend list?]

 

-[Attention!]

-

 [User %s was deleted from your friend list]

 

 [Friend request from the user %s declined]

@@ -247,12 +297,8 @@ Erreurs
 

 [Are you sure to report abuse on %s?]

 

-[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]

-

 [Attachments:]

 

-[Photo]

-Photo

 [Audio]

 Audio

 [Video]

@@ -261,5 +307,7 @@ Video
 Document

 [Wall post]

 

+[Image]

+

 [Unsupported or unknown attachment type: %s]

 

diff --git a/langpacks/french/Untranslated/VKontakte.txt b/langpacks/french/Untranslated/VKontakte.txt
index a45899f296..ee8d05bbda 100644
--- a/langpacks/french/Untranslated/VKontakte.txt
+++ b/langpacks/french/Untranslated/VKontakte.txt
@@ -1,4 +1,10 @@
-[E-mail or phone number:]

+[News and event notifications]

+[WARNING: Causes excessive network traffic!!!]

+[Enable news feeds]

+[Enable event notifications]

+[BBCode support on news and event notifications]

+[Interval for updates (min):]

+[E-mail or phone number:]

 [Open VKontakte site]

 [Hide chats on startup]

 [Always notify as unread for all incoming message]

@@ -19,13 +25,16 @@
 [Local settings]

 [Contact list group:]

 [Server-side delivery confirmation]

-[Automatically sync last messages]

 [Automatically wipe local contacts missing in your friend list]

 [Mark message as read...]

 [on read]

 [on receive]

 [on reply]

 [on typing]

+[Sync history on protocol online...]

+[automatically]

+[for last 1 day]

+[for last 3 days]

 [Bots challenge test]

 [Invite user to chat]

 [Choose one of your contacts to be invited:]

@@ -56,6 +65,15 @@
 [View/change &title]

 [&Destroy room]

 [&Kick]

+[User was tagged in these photos:]

+[News from %s%s%s (%s)\n%s]

+[\tRepost from %s%s%s (%s)\n%s]

+[\nNews link: %s]

+[%s%s%s (%s) commented %%s\n%s]

+[%s%s%s (%s) posted %%s\n%s]

+[liked your]

+[shared your]

+[post]

 [Couldn't save file]

 [Invalid album id]

 [Invalid server]

@@ -66,26 +84,27 @@
 [Invalid filesize]

 [Unknown error occurred]

 [File upload error]

+[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]

+[Attention!]

+[News and notifications]

 [Create new chat]

-[Reload all messages from vk.com]

 [Add as friend]

 [Delete from friend list]

 [Ban user]

 [Destroy room]

 [Open broadcast]

+[Reload messages from vk.com...]

+[for last week]

+[for last 30 days]

+[for last 90 days]

+[for all time]

 [Notification]

 [User %s added as friend]

 [You cannot add yourself as friend]

 [Cannot add this user to friends as they have put you on their blacklist]

 [Cannot add this user to friends as you put him on blacklist]

-[Start sync history]

-[Sync history]

-[Sync history complete]

-[History import is complete]

-[History import]

 [Please authorize me to add you to my friend list.]

 [Are you sure to delete %s from your friend list?]

-[Attention!]

 [User %s was deleted from your friend list]

 [Friend request from the user %s declined]

 [Friend request suggestion for the user %s deleted]

@@ -96,7 +115,7 @@
 [Are you sure to ban %s? %s%sContinue?]

 [\nIt will also]

 [Are you sure to report abuse on %s?]

-[Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]

 [Attachments:]

 [Wall post]

+[Image]

 [Unsupported or unknown attachment type: %s]