[gcompris/voices] french word list, removed one to ten.ogg as we use the unicode version



commit 713f9e20bf45f039fd26737f093f922b861a47bd
Author: Bruno Coudoin <bruno coudoin gcompris net>
Date:   Fri Jan 2 19:27:46 2015 +0100

    french word list, removed one to ten.ogg as we use the unicode version

 fr/words/content.json  |   11 +----------
 generate_voices_rcc.sh |    3 ++-
 2 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/fr/words/content.json b/fr/words/content.json
index 5d55349..f94f04f 100644
--- a/fr/words/content.json
+++ b/fr/words/content.json
@@ -1100,14 +1100,5 @@
     {"U0037.ogg": "sept"},
     {"U0038.ogg": "huit"},
     {"U0039.ogg": "neuf"},
-    {"10.ogg": "dix"},
-    {"#one.ogg": "NA"},
-    {"#two.ogg": "NA"},
-    {"#three.ogg": "NA"},
-    {"#four.ogg": "NA"},
-    {"#five.ogg": "NA"},
-    {"#six.ogg": "NA"},
-    {"#seven.ogg": "NA"},
-    {"#eight.ogg": "NA"},
-    {"#nine.ogg": "NA"}
+    {"10.ogg": "dix"}
 ]
diff --git a/generate_voices_rcc.sh b/generate_voices_rcc.sh
index 1d9e5bd..00649ce 100755
--- a/generate_voices_rcc.sh
+++ b/generate_voices_rcc.sh
@@ -16,7 +16,8 @@
 
 QRC_DIR="."
 RCC_DIR=".rcc"
-RCC_DEFAULT=`which rcc 2>/dev/null`   # default, better take /usr/bin/rcc?
+#RCC_DEFAULT=`which rcc 2>/dev/null`   # default, better take /usr/bin/rcc?
+RCC_DEFAULT=$Qt5_DIR/bin/rcc
 CONTENTS_FILE=Contents
 MD5SUM=/usr/bin/md5sum
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]