langpacks: update according to [10004]

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

2 files changed, 66 insertions, 34 deletions

diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index 3e10aaf892..c700c7ac11 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -38,8 +38,12 @@
 [Error occurred when removing contact from server.]

 [Request for friendship was sent.]

 [Error occurred when requesting friendship.]

+[Request for friendship was accepted.]

+[Error occurred when accepting friendship request.]

 [Request for friendship was canceled.]

 [Error occurred when canceling friendship request.]

+[Request for friendship was ignored.]

+[Error occurred when ignoring friendship request.]

 [<< Contacts]

 [What's on your mind, %s?]

 [Note: Make sure you have disabled 'Validate SSL certificates' option in Network options to work properly.]

@@ -71,5 +75,6 @@
 [Cancel friendship request]

 [Request friendship]

 [Approve friendship]

+[Deny friendship request]

 [Check Friends Requests]

 [Check Newsfeeds]

diff --git a/langpacks/french/Untranslated/NewXstatusNotify.txt b/langpacks/french/Untranslated/NewXstatusNotify.txt
index 5cba5fba67..96d83755df 100644
--- a/langpacks/french/Untranslated/NewXstatusNotify.txt
+++ b/langpacks/french/Untranslated/NewXstatusNotify.txt
@@ -1,13 +1,12 @@
 [Notifies you when a contact changes his/her (X)status or status message.]

 [Automatically turn off Popups and Sounds on status change]

-[Notify me for people not in my Contact List]

+[Notify me for people not on my contact list]

 [Use individual sounds]

 [Log to file]

 [Extra status]

 [Status message]

-[Log in history]

-[Log status changes in history]

-[Only when message window is open]

+[Also when extra status or status message changes]

+[Notify when contact changes]

 [Change]

 [Enable sounds]

 [Enable popups]

@@ -16,54 +15,79 @@
 [Extra status logging]

 [Disable all]

 [Enable all]

+[Status message notify]

+[Status message logging]

 [Use Popup colors]

 [Show previous status too]

 [Popups when status changes to:]

 [Show contact group name]

 [Use alternative descriptions]

 [Show status description]

-[Ignore empty status and xStatus messages]

 [Connection timeout]

 [Notification]

 [Disable for extra status 'Music']

 [Truncate message length to:]

-[Title - text delimiter:]

-[Remove:]

-[New message:]

-[New status:]

+[Notify when contact removes extra status]

+[Notify when contact changes extra status message]

+[Notify when contact changes extra status]

 [Variables]

+[Notify when contact removes extra status message]

+[Show Popups when I connect]

 [Disable notifications]

 [Disable globally]

 [Disable only if I change global status]

 [Disable when my status is:]

-[Extra status log]

-[Enable logging extra status to message window]

-[Keep events in history]

-[Prevent identical logs]

-[On opening ML:]

-[Show Popups when I connect]

+[Log extra status changes]

+[Log extra status changes to file]

+[Only when message window is open]

+[Log extra status changes to history]

+[Remove events from history when closing message window]

+[Log when contact removes extra status]

+[Log when contact changes extra status message]

+[Log when contact changes extra status]

+[Log extra status when opening message window]

+[Log when contact removes extra status message]

 [Enable/Disable accounts which you don't wish to be notified for:]

+[Notify when contact changes status message]

+[Notify when contact removes status message]

+[Log status changes]

+[Log status changes to file]

+[Log status changes to history]

+[Log previous status too]

+[Log status message changes]

+[Log status message changes to file]

+[Log status message changes to history]

+[Log when contact changes status message]

+[Log when contact removes status message]

+[Log status message when opening message window]

 [Wave files]

-[aborting]

+[Sound file]

 [%s is now %s]

+[aborting]

+[%s changed status message to %s]

 [(M) hides in shadows...]

 [(F) hides in shadows...]

 [(U) hides in shadows...]

+[User: from offline (has priority!)]

+[Status message removed]

+[Status message changed]

+[Extra status removed]

+[Extra status message changed]

+[Extra status changed]

+[Extra status message removed]

 [Enable status notification]

 [Disable status notification]

 [Notification enabled]

 [Notification disabled]

 [New Status Notify]

-[User: from offline (has priority!)]

-[Extra status changed]

-[Extra status message changed]

-[Extra status removed]

 [Toggle status notification]

 [This is status message]

-[Do you want to reset all templates to default?]

-[Reset templates]

+[This is extra status]

 [Show available variables]

 [Reset all templates to default]

+[Do you want to reset all templates to default?]

+[Reset templates]

+[Logging]

 [(was %s)]

 [Open message window]

 [Close popup]

@@ -71,20 +95,23 @@
 [Open contact menu]

 [Open contact history]

 [Do nothing]

-[You cannot specify a value lower than %d and higher than %d.]

 [Can't open the log file!]

 [NewXstatusNotify]

 [Mood]

 [Activity]

 [Xstatus]

-[%s, %s. %s removed %s.\r\n]

-[%s, %s. %s changed %s to: %s.\r\n]

-[changed %N to: %T%D%I]

-[changed %N message to:%D%I]

-[removed %N]

-[changed his/her status message to %n]

-[changed %N @ %T%D%I]

-[changed %N message @ %I]

-[has %N @ %T%D%I]

-[These variables are available:\r\n\r\n%N\textra status name (Xstatus, Mood, Activity)\r\n%T\textra status title\r\n%I\textra status text\r\n%D\tdelimiter\r\n%B\tline break (can be used as delimiter)]

-[These variables are available:\r\n\r\n%n\tNew Status Message\r\n%o\tOld Status Message\r\n%c\tCustom Nickname\r\n\\n\tline break\r\n\\t\ttab stop]

+[<no title>]

+[%s changed %s]

+[changed %n to: %t]

+[removed %n]

+[changed %n message to: %m]

+[removed %n message]

+[changed status message to: %n]

+[removed status message]

+[changed %n @ %t: %m]

+[changed %n message @ %m]

+[has %n @ %t: %m]

+[changed status message @ %n]

+[is %s and has status message @ %n]

+[These variables are available:\r\n\r\n%n\textra status name (Xstatus, Mood, Activity)\r\n%t\textra status title\r\n%m\textra status message\r\n%c\tcustom nickname\r\n\\n\tline break\r\n\\t\ttab stop]

+[These variables are available:\r\n\r\n%n\tnew status message\r\n%o\told status message\r\n%c\tcustom nickname\r\n%s\tcurrent status\r\n\\n\tline break\r\n\\t\ttab stop]