summaryrefslogtreecommitdiffstats
path: root/scilab/modules/texmacs
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-15 15:25:59 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-15 15:25:59 +0100
commitc523b1358d8ea7a578f22edc011c4077aeef4aaa (patch)
tree03b0afb11b4ac4f9b5b6c2f4bc6908e86ee7b92d /scilab/modules/texmacs
parent9c61e07470b2691e5dd1be660ad367e6dcd0d4f2 (diff)
parent362988b1133a09c67b43aef4a40cca732bae2310 (diff)
downloadscilab-c523b1358d8ea7a578f22edc011c4077aeef4aaa.zip
scilab-c523b1358d8ea7a578f22edc011c4077aeef4aaa.tar.gz
Merge remote branch 'origin/5.2'
Conflicts: scilab/CHANGES_5.2.X scilab/configure scilab/configure.ac scilab/etc/classpath.xml.vc scilab/m4/docbook.m4 scilab/modules/graphics/graphics.iss scilab/scilab-lib.properties.vc
Diffstat (limited to 'scilab/modules/texmacs')
-rw-r--r--scilab/modules/texmacs/locales/fr_FR/texmacs.po4
1 files changed, 3 insertions, 1 deletions
diff --git a/scilab/modules/texmacs/locales/fr_FR/texmacs.po b/scilab/modules/texmacs/locales/fr_FR/texmacs.po
index 60461a6..c002cb1 100644
--- a/scilab/modules/texmacs/locales/fr_FR/texmacs.po
+++ b/scilab/modules/texmacs/locales/fr_FR/texmacs.po
@@ -14,5 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2009-12-15 16:52+0000\n" 17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19
20