[svn-upgrade] Integrating new upstream version, teleschorsch (0.1.2)

diff --git a/ChangeLog b/ChangeLog
index 3f37c79e13ea77a34859ebace25fb852bf5319ad..510bea4788836c94b720a40ec92f936ab557b7ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------------
+r440 | gregoa | 2007-03-08 00:21:17 +0100 (Thu, 08 Mar 2007) | 1 line
+Changed paths:
+   M /teleschorsch/trunk/makedist
+
+minor fixes in makedist
+------------------------------------------------------------------------
 r439 | philipp | 2007-03-08 00:17:24 +0100 (Thu, 08 Mar 2007) | 2 lines
 Changed paths:
    M /teleschorsch/trunk/maindialog.ui

diff --git a/qteleschorsch.pro b/qteleschorsch.pro
index 068f05e636f9c7489174255823ce79703223c4a0..eb85fff36098fd5a9d20b0fb022fb4346e43d6c6 100644 (file)
--- a/qteleschorsch.pro
+++ b/qteleschorsch.pro
@@ -14,5 +14,5 @@ PRE_TARGETDEPS = compiler_translation_make_all
 translation.output  = ${QMAKE_FILE_BASE}.qm
 translation.commands = lrelease ${QMAKE_FILE_NAME}
 translation.input = TRANSLATIONS
-translation.CONFIG += no_link
+translation.CONFIG = no_link
 QMAKE_EXTRA_COMPILERS += translation

diff --git a/qteleschorsch_fr.ts b/qteleschorsch_fr.ts
index 5a8440caf838ac40b992cbcc2ecea43d9152ff72..b49575e2bdfa08c4d14c80eae1fea688b823d85b 100644 (file)
--- a/qteleschorsch_fr.ts
+++ b/qteleschorsch_fr.ts
@@ -20,7 +20,7 @@
     <message>
         <location filename="maindialog.ui" line="41"/>
         <source>Channel</source>
-        <translation>Chaine</translation>
+        <translation>Chaîne</translation>
     </message>
     <message>
         <location filename="maindialog.ui" line="74"/>