merge of lanpack changes

25 files changed, 75 insertions, 71 deletions

diff --git a/langpacks/french/Plugins/AutoShutdown.txt b/langpacks/french/Plugins/AutoShutdown.txt
index 2db8a3c5ed..6d826b416b 100644
--- a/langpacks/french/Plugins/AutoShutdown.txt
+++ b/langpacks/french/Plugins/AutoShutdown.txt
@@ -75,8 +75,6 @@ EN PAUSE
 Figer le compte à rebours

 [&Cancel countdown]

 &Annuler le compte à rebours

-[AutoShutdown]

-

 [Countdown on frame]

 Compte à rebours en image

 [Background]

@@ -185,6 +183,9 @@ Vous déconnecte de tous vos protocoles et coupe votre connexion Internet.
 Notifications

 [Automatic shutdown countdown]

 Compte à rebours de Automatic Shutdown

+;file \plugins\AutoShutdown\src\stdafx.h

+[AutoShutdown]

+

 ;file \plugins\AutoShutdown\src\utils.cpp

 [Toggle automatic shutdown]

 Automatic Shutdown

diff --git a/langpacks/french/Plugins/AvatarHistory.txt b/langpacks/french/Plugins/AvatarHistory.txt
index 2f4c0a7098..4730b00576 100644
--- a/langpacks/french/Plugins/AvatarHistory.txt
+++ b/langpacks/french/Plugins/AvatarHistory.txt
@@ -129,8 +129,6 @@ Le contact a changé d'avatar
 [Contact removed avatar]

 Le contact a retiré l'avatar

 ;file \plugins\AvatarHistory\src\icolib.cpp

-[History]

-Historique

 [Avatar overlay]

 

 ;file \plugins\AvatarHistory\src\options.cpp

@@ -146,6 +144,8 @@ Afficher l'historique du contact
 Test : Contact

 [Test description]

 Test : Description

+[History]

+Historique

 [Avatar]

 Avatar

 [Popups]

diff --git a/langpacks/french/Plugins/ConnectionNotify.txt b/langpacks/french/Plugins/ConnectionNotify.txt
index 748743447c..35cfcc83db 100644
--- a/langpacks/french/Plugins/ConnectionNotify.txt
+++ b/langpacks/french/Plugins/ConnectionNotify.txt
@@ -1,7 +1,7 @@
 #muuid {4bb5b4aa-c364-4f23-9746-d5b708a286a5}

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

 ;  File: ConnectionNotify.dll

-;  Plugin: ConnectionNotify

+;  Plugin: Connection Notify

 ;  Version: 0.1.0.5

 ;  Authors: MaKaR

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

diff --git a/langpacks/french/Plugins/CrashDumper.txt b/langpacks/french/Plugins/CrashDumper.txt
index a418cba166..cd10213494 100644
--- a/langpacks/french/Plugins/CrashDumper.txt
+++ b/langpacks/french/Plugins/CrashDumper.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: CrashDumper.dll

 ;  Plugin: Crash dumper

-;  Version: 0.1.0.1

+;  Version: 0.1.0.2

 ;  Authors: borkra

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

 [Crash Dumper and Version Information for Miranda NG.]

diff --git a/langpacks/french/Plugins/Exchange.txt b/langpacks/french/Plugins/Exchange.txt
index 71fb32c576..ab5e2a0d58 100644
--- a/langpacks/french/Plugins/Exchange.txt
+++ b/langpacks/french/Plugins/Exchange.txt
@@ -1,7 +1,7 @@
 #muuid {2fd0df15-7098-41ce-aa92-ff621806e38b}

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

 ;  File: Exchange.dll

-;  Plugin: Exchange

+;  Plugin: Exchange notifier plugin

 ;  Version: 0.1.3.4

 ;  Authors: Cristian Libotean, Attila Vajda, MaKaR (NG)

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

diff --git a/langpacks/french/Plugins/Facebook.txt b/langpacks/french/Plugins/Facebook.txt
index f0e67ae06a..4d326bbf33 100644
--- a/langpacks/french/Plugins/Facebook.txt
+++ b/langpacks/french/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook

-;  Version: 0.4.1.2

+;  Version: 0.4.1.3

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

diff --git a/langpacks/french/Plugins/HwHotKeys.txt b/langpacks/french/Plugins/HwHotKeys.txt
index db1ac619a9..232f3a488b 100644
--- a/langpacks/french/Plugins/HwHotKeys.txt
+++ b/langpacks/french/Plugins/HwHotKeys.txt
@@ -5,9 +5,9 @@
 ;  Version: 1.0.0.6

 ;  Authors: Eugene f2065

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

-;file \plugins\HwHotKeys\res\HwHotKeys.rc

 [Allows you to assign expanded multimedia keys (only for PS/2 keyboards).]

 

+;file \plugins\HwHotKeys\res\HwHotKeys.rc

 [Close Miranda]

 Fermer Miranda

 [Assign]

diff --git a/langpacks/french/Plugins/IEHistory.txt b/langpacks/french/Plugins/IEHistory.txt
index 91b923ce0e..1a3f1ec2a9 100644
--- a/langpacks/french/Plugins/IEHistory.txt
+++ b/langpacks/french/Plugins/IEHistory.txt
@@ -1,7 +1,7 @@
 #muuid {2f093b88-f389-44f1-9e2a-37c29194203a}

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

 ;  File: IEHistory.dll

-;  Plugin: IEHistory

+;  Plugin: IE History

 ;  Version: 0.0.1.7

 ;  Authors: Cristian Libotean, Miranda NG team

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

diff --git a/langpacks/french/Plugins/IRC.txt b/langpacks/french/Plugins/IRC.txt
index 58719f8e9a..b6261a35e6 100644
--- a/langpacks/french/Plugins/IRC.txt
+++ b/langpacks/french/Plugins/IRC.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IRC.dll

 ;  Plugin: IRC protocol

-;  Version: 0.95.7.2

+;  Version: 0.95.8.1

 ;  Authors: Miranda team

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

 [Internet Relay Chat (IRC) protocol support for Miranda NG.]

diff --git a/langpacks/french/Plugins/Import.txt b/langpacks/french/Plugins/Import.txt
index 122dcb932e..32b5a06ac0 100644
--- a/langpacks/french/Plugins/Import.txt
+++ b/langpacks/french/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.8.6

+;  Version: 0.95.9.1

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

diff --git a/langpacks/french/Plugins/LinkList.txt b/langpacks/french/Plugins/LinkList.txt
index 312af19599..6385e08fb2 100644
--- a/langpacks/french/Plugins/LinkList.txt
+++ b/langpacks/french/Plugins/LinkList.txt
@@ -128,8 +128,6 @@ Sortant
 [no settings]

 

 ;file \plugins\HistoryLinkListPlus\src\linklist.cpp

-[&Create Linklist]

-

 [History]

 Historique

 [Processing history...]

@@ -138,6 +136,8 @@ Historique
 

 [Could not allocate memory!]

 

+[&Create Linklist]

+

 ;file \plugins\HistoryLinkListPlus\src\linklist_dlg.cpp

 [Linklist plugin]

 

diff --git a/langpacks/french/Plugins/MirLua.txt b/langpacks/french/Plugins/MirLua.txt
index 2823a3a7cc..f33291d5ae 100644
--- a/langpacks/french/Plugins/MirLua.txt
+++ b/langpacks/french/Plugins/MirLua.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirLua.dll

 ;  Plugin: MirLua

-;  Version: 0.11.8.8

+;  Version: 0.11.8.9

 ;  Authors: Miranda NG team

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

 [Extends Miranda NG functionality with Lua scripts.]

@@ -18,14 +18,7 @@
 Général

 [Popup on obsolete methods]

 

-;file \plugins\MirLua\src\main.cpp

-[Services]

-Services

-[C libs folder]

-

-[Scripts folder]

-

-;file \plugins\MirLua\src\mlua_icons.cpp

+;file \plugins\MirLua\src\icons.cpp

 [Script]

 

 [Loaded]

@@ -36,6 +29,13 @@ Services
 Ouvrir

 [Reload]

 Recharger

-;file \plugins\MirLua\src\mlua_options.cpp

+;file \plugins\MirLua\src\options.cpp

 [Common scripts]

 

+[Services]

+Services

+;file \plugins\MirLua\src\plugin.cpp

+[C libs folder]

+

+[Scripts folder]

+

diff --git a/langpacks/french/Plugins/MyDetails.txt b/langpacks/french/Plugins/MyDetails.txt
index c47d3daf4d..fd89b06f06 100644
--- a/langpacks/french/Plugins/MyDetails.txt
+++ b/langpacks/french/Plugins/MyDetails.txt
@@ -149,9 +149,9 @@ Cacher mes détails
 

 [Next account]

 

+;file \plugins\MyDetails\src\options.cpp

 [Contact list]

 Liste de contacts

-;file \plugins\MyDetails\src\options.cpp

 ;file \plugins\MyDetails\src\services.cpp

 [Set my nickname for %s]

 Changer mon pseudo pour %s

diff --git a/langpacks/french/Plugins/NewXstatusNotify.txt b/langpacks/french/Plugins/NewXstatusNotify.txt
index c09a67c048..2bfd00273f 100644
--- a/langpacks/french/Plugins/NewXstatusNotify.txt
+++ b/langpacks/french/Plugins/NewXstatusNotify.txt
@@ -233,6 +233,10 @@ Tous les fichiers
 [(default sound)]

 (son par défaut)

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

+[Notification enabled]

+

+[Notification disabled]

+

 [<no status message>]

 <aucun message d'état>

 [Contact]

@@ -349,14 +353,10 @@ Contact : Au téléphone
 

 [Disable status notification]

 

-[Notification enabled]

-

-[Notification disabled]

+[Toggle status notification]

 

 [New Status Notify]

 

-[Toggle status notification]

-

 [Status change]

 Changement d'état

 ;file \plugins\NewXstatusNotify\src\options.cpp

diff --git a/langpacks/french/Plugins/Nudge.txt b/langpacks/french/Plugins/Nudge.txt
index ad4ad9e98b..0b3cb7b87f 100644
--- a/langpacks/french/Plugins/Nudge.txt
+++ b/langpacks/french/Plugins/Nudge.txt
@@ -79,22 +79,22 @@ Statique
 [Shaking Message Window Options]

 Tremblement de la fenêtre de message

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

+[Nudge as Default]

+

 [You are not allowed to send too much nudge (only 1 each %d sec, %d sec left)]

 Vous ne pouvez pas envoyer tant de wizz (uniquement 1 toutes les %d sec, %d sec restantes)

+[Show Nudge]

+

+[Nudge for %s]

+

 [Nudge]

 

 [Default Nudge]

 

-[Nudge as Default]

-

 [Send nudge]

 

 [Send &nudge]

 

-[Show Nudge]

-

-[Nudge for %s]

-

 ;file \plugins\Nudge\src\nudge.cpp

 [You received a nudge]

 Vous avez reçu un wizz

diff --git a/langpacks/french/Plugins/PluginUpdater.txt b/langpacks/french/Plugins/PluginUpdater.txt
index ed56039044..4b63d818d0 100644
--- a/langpacks/french/Plugins/PluginUpdater.txt
+++ b/langpacks/french/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.2.5

+;  Version: 0.2.0.1

 ;  Authors: Mataes, George Hazan

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

 [Installs and updates plugins and other Miranda NG components.]

diff --git a/langpacks/french/Plugins/Popup.txt b/langpacks/french/Plugins/Popup.txt
index 8929cf1dca..0c73e98c74 100644
--- a/langpacks/french/Plugins/Popup.txt
+++ b/langpacks/french/Plugins/Popup.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Popup.dll

 ;  Plugin: Popup plus

-;  Version: 2.1.1.12

+;  Version: 2.1.1.14

 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)

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

 [Provides popup notification services for different plugins.]

@@ -406,9 +406,6 @@ Rafraîchir
 ;file \plugins\Popup\src\services.cpp

 [Notify]

 

-;file \plugins\Popup\src\skin.cpp

-[The skin you are trying to load is designed\r\nfor newer version of Popup plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]

-

 ;file \plugins\Popup\src\srmm_menu.cpp

 [Auto]

 

diff --git a/langpacks/french/Plugins/QuickContacts.txt b/langpacks/french/Plugins/QuickContacts.txt
index 48817b63ad..d2e752ea92 100644
--- a/langpacks/french/Plugins/QuickContacts.txt
+++ b/langpacks/french/Plugins/QuickContacts.txt
@@ -36,11 +36,10 @@ Contacts
 

 [Show all contacts (Ctrl+A)]

 

-;file \plugins\QuickContacts\src\options.cpp

-[Quick Contacts]

+;file \plugins\QuickContacts\src\dialog.cpp

+[Show all contacts]

 

-;file \plugins\QuickContacts\src\quickcontacts.cpp

-[Open dialog]

+[Send message]

 

 [Send file]

 Envoyer un fichier

@@ -52,9 +51,11 @@ Envoyer un fichier
 Ouvrir historique

 [Open contact menu]

 

-[Show all contacts]

+;file \plugins\QuickContacts\src\options.cpp

+[Quick Contacts]

 

-[Quick Contacts...]

+;file \plugins\QuickContacts\src\quickcontacts.cpp

+[Open dialog]

 

-[Send message]

+[Quick Contacts...]

 

diff --git a/langpacks/french/Plugins/RemovePersonalSettings.txt b/langpacks/french/Plugins/RemovePersonalSettings.txt
index 3c5080bb66..bf31a147c5 100644
--- a/langpacks/french/Plugins/RemovePersonalSettings.txt
+++ b/langpacks/french/Plugins/RemovePersonalSettings.txt
@@ -8,12 +8,12 @@
 [Remove personal settings to allow you to send a profile to other user(s) without sending personal data.]

 

 ;file \plugins\RemovePersonalSettings\src\rps.cpp

-[Remove Personal Settings...]

-

 [Configuration file could not be found!]

 

 [Settings are deleted now.]

 

+[Remove Personal Settings...]

+

 ;file \plugins\RemovePersonalSettings\src\stdafx.h

 [All your personal settings will be erased!\nMake sure you are running this from a copy of your profile (and not over the original one).\nRunning this will erase files/folders under Miranda main folder.\n\nAre you sure you want to remove all your personal settings?\n\n(You cannot say that I don't told you about the risks :P)]

 

diff --git a/langpacks/french/Plugins/Scriver.txt b/langpacks/french/Plugins/Scriver.txt
index 70af83cc59..2fbc878068 100644
--- a/langpacks/french/Plugins/Scriver.txt
+++ b/langpacks/french/Plugins/Scriver.txt
@@ -22,10 +22,6 @@ Sauver taille/position pour chaque contact
 Minimiser à l'envoi

 [Hide windows on close]

 Cacher les fenêtres à la fermeture

-[Send message on 'Enter']

-Taper 1 fois "Entrée" pour envoyer

-[Send message on double 'Enter']

-Taper 2 fois "Entrée" pour envoyer

 [Remember unsent messages]

 Se rappeler des messages non envoyés

 [Delete temporary contacts on closing]

@@ -34,6 +30,12 @@ Supprimer les contacts temporaires à la fermeture
 M'alerter quand le message n'a pas été reçu après

 [seconds]

 secondes

+[Send message on 'Enter']

+Taper 1 fois "Entrée" pour envoyer

+[Send message on double 'Enter']

+Taper 2 fois "Entrée" pour envoyer

+[Send message on 'Ctrl+Enter']

+

 [Tabs]

 Onglets

 [Enable tabs]

@@ -80,6 +82,8 @@ inactive
 Taille min de la zone d'entrée

 [lines]

 lignes

+[You can use embedded variables here: %name% for contact's name, %status% for its status, %statusmsg% for its status message and %account% for its account's name]

+

 [Message window event log]

 Zone de texte de la Fenêtre

 [Enable IEView]

diff --git a/langpacks/french/Plugins/SimpleStatusMsg.txt b/langpacks/french/Plugins/SimpleStatusMsg.txt
index 4e3fcb570d..fec59e5cf2 100644
--- a/langpacks/french/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/french/Plugins/SimpleStatusMsg.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

-;  Version: 1.9.0.6

+;  Version: 1.9.0.7

 ;  Authors: Bartosz 'Dezeath' Białek, Harven

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

 [Provides a simple way to set status and away messages.]

diff --git a/langpacks/french/Plugins/TabSRMM.txt b/langpacks/french/Plugins/TabSRMM.txt
index 3506f7b6c1..4e6705b57e 100644
--- a/langpacks/french/Plugins/TabSRMM.txt
+++ b/langpacks/french/Plugins/TabSRMM.txt
@@ -1779,8 +1779,6 @@ Il y a des messages non lus en attente de confirmation.\nSi vous fermer cette fe
 ;file \plugins\TabSRMM\src\srmm.cpp

 [This version of TabSRMM requires Windows 2000 or later.]

 

-[TabSRMM message (%s)]

-Message TabSRMM (%s)

 ;file \plugins\TabSRMM\src\taskbar.cpp

 [Previews not available when using History++ plugin for message log display.]

 

@@ -2014,6 +2012,8 @@ Utiliser IEView
 [Set messaging options for %s]

 

 ;file \plugins\TabSRMM\src\utils.cpp

+[TabSRMM message (%s)]

+Message TabSRMM (%s)

 [Important release notes|A test warning message]

 

 [Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0]

diff --git a/langpacks/french/Plugins/VKontakte.txt b/langpacks/french/Plugins/VKontakte.txt
index 3ed2b955e9..7a14b99896 100644
--- a/langpacks/french/Plugins/VKontakte.txt
+++ b/langpacks/french/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.4.5

+;  Version: 0.1.5.2

 ;  Authors: Miranda NG team

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

 [VKontakte protocol support for Miranda NG.]

diff --git a/langpacks/french/Plugins/WhoUsesMyFiles.txt b/langpacks/french/Plugins/WhoUsesMyFiles.txt
index 2ed12c4cef..b72225d82d 100644
--- a/langpacks/french/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/french/Plugins/WhoUsesMyFiles.txt
@@ -54,6 +54,19 @@ Utiliser les couleurs de Windows
 

 [Show current connections]

 

+;file \plugins\WhoUsesMyFiles\src\options.cpp

+[Popup plugin not found!]

+

+[Error]

+Erreur

+[Common Dialog Error 0x%lx]

+

+[Not implemented yet...]

+

+[Who uses my files]

+

+[Services]

+Services

 ;file \plugins\WhoUsesMyFiles\src\wumf.cpp

 [User]

 Utilisateur

@@ -70,24 +83,12 @@ Fichier
 ;file \plugins\WhoUsesMyFiles\src\wumfplug.cpp

 [Error creating menu]

 

-[Popup plugin not found!]

-

-[Error]

-Erreur

 [Enable WUMF popups]

 

 [Disable WUMF popups]

 

-[Common Dialog Error 0x%lx]

-

-[Not implemented yet...]

-

 [Show connections list]

 

-[Who uses my files]

-

-[Services]

-Services

 [Popups]

 Popups

 [WUMF: Show connections]

diff --git a/langpacks/french/Plugins/ZeroNotify.txt b/langpacks/french/Plugins/ZeroNotify.txt
index 9b2a5a8bb5..7204c7978b 100644
--- a/langpacks/french/Plugins/ZeroNotify.txt
+++ b/langpacks/french/Plugins/ZeroNotify.txt
@@ -16,7 +16,7 @@ Pas de flash CList si :
 Pas de flash systray si :

 [Hide the "toggle sound" menu item (requires restart of Miranda)]

 Cacher le Menu "toggle sound" (nécessite le redémarrage de Miranda)

-;file \plugins\ZeroNotification\src\main.cpp

+;file \plugins\ZeroNotification\src\options.cpp

 [Zero Notifications]

 

 [Plugins]