langpacks: update

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

6 files changed, 47 insertions, 10 deletions

diff --git a/langpacks/french/Untranslated/=CORE=.txt b/langpacks/french/Untranslated/=CORE=.txt
index 772b1fc294..e44ee64249 100644
--- a/langpacks/french/Untranslated/=CORE=.txt
+++ b/langpacks/french/Untranslated/=CORE=.txt
@@ -107,6 +107,24 @@
 [Account name must be filled.]

 [Account error]

 [Account %s is being disabled]

+[Browser: Back]

+[Browser: Forward]

+[Browser: Refresh]

+[Browser: Stop]

+[Browser: Search]

+[Browser: Fav]

+[Browser: Home]

+[Mute]

+[Vol-]

+[Vol+]

+[Media: Next Track]

+[Media: Prev. Track]

+[Media: Stop]

+[Media: Play/Pause]

+[Mail]

+[Media: Select]

+[App 1]

+[App 2]

 [Ctrl + ]

 [Alt + ]

 [Shift + ]

diff --git a/langpacks/french/Untranslated/HwHotKeys.txt b/langpacks/french/Untranslated/HwHotKeys.txt
new file mode 100644
index 0000000000..22044b6736
--- /dev/null
+++ b/langpacks/french/Untranslated/HwHotKeys.txt
@@ -0,0 +1,6 @@
+[Hardware HotKeys plugin\r\nAllows to assign expanded multimedia-keys (only for PS/2-keyboards)]

+[Assign]

+[Last pressed key]

+[Extended flag (1xx), Hardware scan code (x23), KeyName]

+[Combine left/right keys Shift, Ctrl, Win, Alt]

+[Combination of keys for assignment]

diff --git a/langpacks/french/Untranslated/Import.txt b/langpacks/french/Untranslated/Import.txt
index d9046b3e65..a5cd4e4494 100644
--- a/langpacks/french/Untranslated/Import.txt
+++ b/langpacks/french/Untranslated/Import.txt
@@ -3,8 +3,10 @@
 [&Next >]

 [< &Back]

 [Import all settings, contacts and all messages]

-[Makes precise copy of the original profile]

-[Select this if you want to customize what to import.]

+[Makes precise copy of the original profile, including all settings, contacts and history.]

+[Imports only contacts and history, and a few settings. Ideal for synchronizing.]

+[Imports contacts only, doesn't import any message history.]

+[Custom schema: you can choose what to import.]

 [Choose appropriate accounts for import]

 [Ignored event from/to self]

 [Added contact %u (found in history)]

@@ -43,7 +45,6 @@
 [Added %d contacts, %d groups and %d events.]

 [Skipped %d contacts.]

 [Skipped %d duplicates and %d filtered events.]

-[Skipped %d duplicates.]

 [Miranda Import]

 [Skipping duplicate group %s.]

 [Import...]

diff --git a/langpacks/french/Untranslated/Jabber.txt b/langpacks/french/Untranslated/Jabber.txt
index a5116c7c9e..d77a6dfcba 100644
--- a/langpacks/french/Untranslated/Jabber.txt
+++ b/langpacks/french/Untranslated/Jabber.txt
@@ -183,6 +183,7 @@
 [Supported features]

 [Info request error]

 [Items request error]

+[Set filter...]

 [One or more addresses for communication related to abusive traffic]

 [One or more addresses for customer feedback]

 [One or more addresses for communication related to sales and marketing]

@@ -656,4 +657,3 @@
 [coding]

 [Moods]

 [Activities]

-[Set filter...]

diff --git a/langpacks/french/Untranslated/MirOTR.txt b/langpacks/french/Untranslated/MirOTR.txt
index d23ab93994..72f043e14e 100644
--- a/langpacks/french/Untranslated/MirOTR.txt
+++ b/langpacks/french/Untranslated/MirOTR.txt
@@ -3,6 +3,7 @@
 [End sessions on window close]

 [End sessions when contacts go offline]

 [Prefix encrypted IMs:]

+[don't rely on the prefix, always check the OTR status icon]

 [Don't add encrypted messages to the history]

 [Also remove OTR system messages]

 [Show OTR system messages inline]

@@ -44,10 +45,6 @@
 [OTR encrypted session with '%s' could not be started]

 [OTR could not encrypt when sending message]

 [[OTR INFO] ]

-[Authentication from %s]

-[Authenticate %s]

-[OTR: %s (%s)]

-[OTR %s (%s)]

 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]

 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]

 [OTR unverified]

@@ -93,3 +90,18 @@
 [MirOTR menu]

 [OTR Status]

 [Private Data]

+[\nusing older protocol version %i]

+[Attempting to start a private conversation...]

+[An error occurred when encrypting your message.\nThe message was not sent]

+['%s' has already closed his/her private connection to you; you should do the same]

+[Error setting up private conversation: %s]

+[Malformed message received]

+[We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you]

+[The last message to '%s' was resent]

+[The encrypted message received from '%s' is unreadable, as you are not currently communicating privately]

+[We received an unreadable encrypted message from '%s']

+[We received a malformed data message from '%s']

+[The following message received from '%s' was NOT encrypted: [%s]]

+['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]

+[unknown OTR message received, please report that to Miranda NG]

+[ has requested an Off-the-Record private conversation. However, you do not have a plugin to support that.\nSee http://wikipedia.org/wiki/Off-the-Record_Messaging for more information.]

diff --git a/langpacks/french/Untranslated/Weather.txt b/langpacks/french/Untranslated/Weather.txt
index 6d50742415..ef4c0b8620 100644
--- a/langpacks/french/Untranslated/Weather.txt
+++ b/langpacks/french/Untranslated/Weather.txt
@@ -40,6 +40,8 @@
 [Auto Update Disabled]

 [N/A]

 [%n   (%u)]

+[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]

+[No information available.\r\nPlease update weather condition first.]

 [Browse]

 [mm]

 [Protocol icon]

@@ -63,9 +65,7 @@
 [Frame Title Font]

 [Frame Background]

 [Display]

-[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]

 [Weather]

 [Enable/Disable Weather Update]

 [Display in a frame]

 [Variable]

-[No information available.\r\nPlease update weather condition first.]