Description: Upstream changes introduced in version 3.31-1
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 xyscan (3.31-1) unstable; urgency=low
 .
   * upgraded to the newest upstream version
 .
 The person named in the Author field signed this changelog entry.
Author: Georges Khaznadar <georgesk@ofset.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

Index: xyscan-3.33/xyscan_fr.ts
===================================================================
--- xyscan-3.33.orig/xyscan_fr.ts
+++ xyscan-3.33/xyscan_fr.ts
@@ -20,7 +20,11 @@
         <translation type="obsolete">Titre &amp;&amp; Version</translation>
     </message>
     <message>
-        <source>Copyright (C) 2002-2009 Thomas S. Ullrich
+        <source>Title &amp;&amp; &amp;Version</source>
+        <translation>Titre &amp;&amp; &amp;Version</translation>
+    </message>
+    <message>
+        <source>Copyright (C) 2002-2010 Thomas S. Ullrich
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -34,11 +38,20 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public
 License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Title &amp;&amp; &amp;Version</source>
-        <translation>Titre &amp;&amp; &amp;Version</translation>
+        <translation>Copyright (C) 2002-2010 Thomas S. Ullrich
+
+Ce programme est un logiciel libre, vous pouvez le le redistribuer et/ou
+le modifier sous les termes de la GNU General Public License comme
+publiée par la Free Software Foundation; soit la version 3 de
+cette licence, soit toute version ultérieure.
+
+Ce programme est distribué dans l&apos;espoir qu&apos;il soit utile,
+mais sans aucune garantie, sans même la garantie implicite qu&apos;il
+soit commercialisable ou adapté à n&apos;importe quel usage. Voyez la GNU
+General Public License pour plus de détails.
+
+Vous devriez avoir reçu une copie de la GNU General Public
+License avec ce programme. Sinon, voyez &lt;http://www.gnu.org/licenses/&gt;.</translation>
     </message>
 </context>
 <context>
@@ -206,11 +219,11 @@ Make sure you are connected to a network
     </message>
     <message>
         <source>&amp;View</source>
-        <translation>Affichage</translation>
+        <translation>A&amp;ffichage</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>Aide</translation>
+        <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>&amp;Open...</source>
@@ -218,7 +231,7 @@ Make sure you are connected to a network
     </message>
     <message>
         <source>&amp;Clear History</source>
-        <translation>Effacer l&apos;historique</translation>
+        <translation>Effacer l&apos;&amp;historique</translation>
     </message>
     <message>
         <source>&amp;Save...</source>
@@ -234,7 +247,7 @@ Make sure you are connected to a network
     </message>
     <message>
         <source>&amp;Paste Image</source>
-        <translation>Coller une image</translation>
+        <translation>Coller une im&amp;age</translation>
     </message>
     <message>
         <source>Delete &amp;Last</source>
@@ -262,11 +275,11 @@ Make sure you are connected to a network
     </message>
     <message>
         <source>&amp;Tool Tips</source>
-        <translation>Bulles d&apos;aide</translation>
+        <translation>&amp;Bulles d&apos;aide</translation>
     </message>
     <message>
         <source>&amp;Check For Updates ...</source>
-        <translation>Vérifier les mises à jour...</translation>
+        <translation>&amp;Vérifier les mises à jour...</translation>
     </message>
     <message>
         <source>Ready</source>
Index: xyscan-3.33/main.cpp
===================================================================
--- xyscan-3.33.orig/main.cpp
+++ xyscan-3.33/main.cpp
@@ -40,13 +40,7 @@ int main(int argc, char *argv[])
     //
     //  Set language and prepare translator
     //
-#ifdef FORCE_FRENCH_LOCALE
-    //  for testing only
-    QLocale::setDefault(QLocale(QLocale::French, QLocale::France));
-    QLocale locale;
-#else
     QLocale locale = QLocale::system();
-#endif
     
     QTranslator translator;
     QTranslator xyscanTranslator;
@@ -59,7 +53,7 @@ int main(int argc, char *argv[])
         bool rc = translator.load("qt_fr", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
         if (!rc)
             cerr << "xdvmp (main): Warning, failed to load french translation (qt_fr)." << endl;
-        rc = xyscanTranslator.load("xyscan_fr",path);
+        rc = xyscanTranslator.load("xyscan_fr", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
         if (!rc)
             cerr << "xdvmp (main): Warning, failed to load french translation (xyscan_fr)." << endl;
         app.installTranslator(&translator);