summaryrefslogtreecommitdiff
path: root/langpacks/french
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2014-01-04 22:35:04 +0000
committerDart Raiden <wowemuh@gmail.com>2014-01-04 22:35:04 +0000
commit6897b0bec345e1db67aaa06dd506de952b0500bd (patch)
tree0f72f9e4a14da5e05ac65e1f97ac84be7ace8d38 /langpacks/french
parent37e5a98b8a26c3c62edbadb073485ec129b8d66c (diff)
langpacks: update according to [7492]
git-svn-id: http://svn.miranda-ng.org/main/trunk@7508 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/french')
-rw-r--r--langpacks/french/Plugins/Folders.txt2
-rw-r--r--langpacks/french/Plugins/ICQ.txt2
-rw-r--r--langpacks/french/Plugins/Jabber.txt18
-rw-r--r--langpacks/french/Plugins/NimContact.txt2
-rw-r--r--langpacks/french/Plugins/PackUpdater.txt2
5 files changed, 22 insertions, 4 deletions
diff --git a/langpacks/french/Plugins/Folders.txt b/langpacks/french/Plugins/Folders.txt
index 4ab0a23ced..3286362bf1 100644
--- a/langpacks/french/Plugins/Folders.txt
+++ b/langpacks/french/Plugins/Folders.txt
@@ -51,7 +51,7 @@ Modifications non sauvegardées
[The plugin can also expand environment variables; the variables are specified like in any other]
-[program that can use environment variables, i.e. %<env variable>%.]
+[program that can use environment variables, i.e., %<env variable>%.]
[Note: Environment variables are expanded before any Miranda variables. So if you have, for]
diff --git a/langpacks/french/Plugins/ICQ.txt b/langpacks/french/Plugins/ICQ.txt
index 498697c0f8..e55f050275 100644
--- a/langpacks/french/Plugins/ICQ.txt
+++ b/langpacks/french/Plugins/ICQ.txt
@@ -106,7 +106,7 @@ Me prévenir lors de l'échec d'un envoi de message (recommandé)
Envoi de message en peer-to-peer
[Enable peer-to-peer message connections]
Activer le support du mode peer-to-peer
-[Passive mode, i.e. do not initiate new connections]
+[Passive mode (i.e., do not initiate new connections)]
Mode passif, ne pas créer de nouvelles connexions
[Extra Features]
Autres fonctions
diff --git a/langpacks/french/Plugins/Jabber.txt b/langpacks/french/Plugins/Jabber.txt
index dc88684a60..5b20324de4 100644
--- a/langpacks/french/Plugins/Jabber.txt
+++ b/langpacks/french/Plugins/Jabber.txt
@@ -1863,6 +1863,8 @@ Le passe actuel est incorrect.
[Error occurred while setting default list]
+[Allow]
+
[Simple mode]
[Advanced mode]
@@ -1907,6 +1909,8 @@ Message
[Query]
+[List has no rules, empty lists will be deleted then changes applied]
+
[allow ]
[deny ]
@@ -1951,6 +1955,12 @@ puis
[Please save list before you make it the default list]
+[No list selected]
+
+[Can't remove active or default list]
+
+[Sorry]
+
[Unable to save list because you are currently offline.]
[List Editor...]
@@ -2057,6 +2067,14 @@ session chat fermée
[sent unknown presence type]
+[Nick:]
+
+[Status:]
+
+[Status text:]
+
+[Real JID:]
+
;file \protocols\JabberG\src\jabber_thread.cpp
[Enter password for %s]
diff --git a/langpacks/french/Plugins/NimContact.txt b/langpacks/french/Plugins/NimContact.txt
index d990f22282..c0e7cf324b 100644
--- a/langpacks/french/Plugins/NimContact.txt
+++ b/langpacks/french/Plugins/NimContact.txt
@@ -122,7 +122,7 @@ Sélectionnez un répertoire
[New Non-IM Contact]
Nouveau contact non-IM
;file \plugins\Non-IM Contact\src\dialog.cpp
-[String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line i.e. lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ) i.e. line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0) <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0))) <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1))) <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4))) <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17)) <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
+[String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0) <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0))) <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1))) <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4))) <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17)) <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]
[Contacts Display Info]
diff --git a/langpacks/french/Plugins/PackUpdater.txt b/langpacks/french/Plugins/PackUpdater.txt
index 6b81d7bb18..33ea99fbb5 100644
--- a/langpacks/french/Plugins/PackUpdater.txt
+++ b/langpacks/french/Plugins/PackUpdater.txt
@@ -2,7 +2,7 @@
;============================================================
; File: PackUpdater.dll
; Plugin: Pack updater
-; Version: 0.0.1.1
+; Version: 0.1.0.1
; Authors: Mataes, ZERO_BiT
;============================================================
[Simple updater for Miranda NG premodified packs.]