Skip to content
Snippets Groups Projects
Commit f9d30b53 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '32-add-accents-and-diacritics-in-french-words' into 'master'

Resolve "Add accents and diacritics in french words"

Closes #32

See merge request !34
parents 9c841fed 44843a74
No related branches found
No related tags found
1 merge request!34Resolve "Add accents and diacritics in french words"
Pipeline #1101 passed
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.1.3 app.versionName=0.1.4
app.versionCode=27 app.versionCode=28
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
}, },
{ {
"key": "ARAIGNEE", "key": "ARAIGNEE",
"fr": "ARAIGNEE", "fr": "ARAIGNÉE",
"en": "SPIDER" "en": "SPIDER"
}, },
{ {
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
}, },
{ {
"key": "BALANCOIRE", "key": "BALANCOIRE",
"fr": "BALANCOIRE", "fr": "BALANÇOIRE",
"en": "SWING" "en": "SWING"
}, },
{ {
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
}, },
{ {
"key": "BEBE", "key": "BEBE",
"fr": "BEBE", "fr": "BÉBÉ",
"en": "BABY" "en": "BABY"
}, },
{ {
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
}, },
{ {
"key": "BUCHE", "key": "BUCHE",
"fr": "BUCHE", "fr": "BÛCHE",
"en": "LOG" "en": "LOG"
}, },
{ {
...@@ -191,12 +191,12 @@ ...@@ -191,12 +191,12 @@
}, },
{ {
"key": "CAFE", "key": "CAFE",
"fr": "CAFE", "fr": "CAFÉ",
"en": "COFFEE" "en": "COFFEE"
}, },
{ {
"key": "CAFETIERE", "key": "CAFETIERE",
"fr": "CAFETIERE", "fr": "CAFETIÈRE",
"en": "COFFEE MAKER" "en": "COFFEE MAKER"
}, },
{ {
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
}, },
{ {
"key": "CHEMINEE", "key": "CHEMINEE",
"fr": "CHEMINEE", "fr": "CHEMINÉE",
"en": "CHIMNEY" "en": "CHIMNEY"
}, },
{ {
...@@ -381,17 +381,17 @@ ...@@ -381,17 +381,17 @@
}, },
{ {
"key": "ECHELLE", "key": "ECHELLE",
"fr": "ECHELLE", "fr": "ÉCHELLE",
"en": "LADDER" "en": "LADDER"
}, },
{ {
"key": "ECUREUIL", "key": "ECUREUIL",
"fr": "ECUREUIL", "fr": "ÉCUREUIL",
"en": "SQUIRREL" "en": "SQUIRREL"
}, },
{ {
"key": "ELEPHANT", "key": "ELEPHANT",
"fr": "ELEPHANT", "fr": "ÉLÉPHANT",
"en": "ELEPHANT" "en": "ELEPHANT"
}, },
{ {
...@@ -406,12 +406,12 @@ ...@@ -406,12 +406,12 @@
}, },
{ {
"key": "EVIER", "key": "EVIER",
"fr": "EVIER", "fr": "ÉVIER",
"en": "SINK" "en": "SINK"
}, },
{ {
"key": "FENETRE", "key": "FENETRE",
"fr": "FENETRE", "fr": "FENÊTRE",
"en": "WINDOW" "en": "WINDOW"
}, },
{ {
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
}, },
{ {
"key": "FLUTE", "key": "FLUTE",
"fr": "FLUTE", "fr": "FLÛTE",
"en": "FLUTE" "en": "FLUTE"
}, },
{ {
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
}, },
{ {
"key": "FUSEE", "key": "FUSEE",
"fr": "FUSEE", "fr": "FUSÉE",
"en": "ROCKET" "en": "ROCKET"
}, },
{ {
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
}, },
{ {
"key": "GUEPE", "key": "GUEPE",
"fr": "GUEPE", "fr": "GUÊPE",
"en": "WASP" "en": "WASP"
}, },
{ {
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
}, },
{ {
"key": "HELICOPTERE", "key": "HELICOPTERE",
"fr": "HELICOPTERE", "fr": "HÉLICOPTÈRE",
"en": "HELICOPTER" "en": "HELICOPTER"
}, },
{ {
...@@ -606,12 +606,12 @@ ...@@ -606,12 +606,12 @@
}, },
{ {
"key": "MESANGE", "key": "MESANGE",
"fr": "MESANGE", "fr": "MÉSANGE",
"en": "TITMOUSE" "en": "TITMOUSE"
}, },
{ {
"key": "METRO", "key": "METRO",
"fr": "METRO", "fr": "MÉTRO",
"en": "METRO" "en": "METRO"
}, },
{ {
...@@ -696,12 +696,12 @@ ...@@ -696,12 +696,12 @@
}, },
{ {
"key": "PATES", "key": "PATES",
"fr": "PATES", "fr": "PÂTES",
"en": "PASTA" "en": "PASTA"
}, },
{ {
"key": "PECHE", "key": "PECHE",
"fr": "PECHE", "fr": "PÊCHE",
"en": "FISHING" "en": "FISHING"
}, },
{ {
...@@ -811,7 +811,7 @@ ...@@ -811,7 +811,7 @@
}, },
{ {
"key": "POUPEE", "key": "POUPEE",
"fr": "POUPEE", "fr": "POUPÉE",
"en": "DOLL" "en": "DOLL"
}, },
{ {
...@@ -846,7 +846,7 @@ ...@@ -846,7 +846,7 @@
}, },
{ {
"key": "RATEAU", "key": "RATEAU",
"fr": "RATEAU", "fr": "RÂTEAU",
"en": "RAKE" "en": "RAKE"
}, },
{ {
...@@ -861,12 +861,12 @@ ...@@ -861,12 +861,12 @@
}, },
{ {
"key": "REVEIL", "key": "REVEIL",
"fr": "REVEIL", "fr": "RÉVEIL",
"en": "ALARM CLOCK" "en": "ALARM CLOCK"
}, },
{ {
"key": "RHINOCEROS", "key": "RHINOCEROS",
"fr": "RHINOCEROS", "fr": "RHINOCÉROS",
"en": "RHINOCEROS" "en": "RHINOCEROS"
}, },
{ {
...@@ -981,17 +981,17 @@ ...@@ -981,17 +981,17 @@
}, },
{ {
"key": "TELEPHONE", "key": "TELEPHONE",
"fr": "TELEPHONE", "fr": "TÉLÉPHONE",
"en": "TELEPHONE" "en": "TELEPHONE"
}, },
{ {
"key": "TELEVISION", "key": "TELEVISION",
"fr": "TELEVISION", "fr": "TÉLÉVISION",
"en": "TELEVISION" "en": "TELEVISION"
}, },
{ {
"key": "THERMOMETRE", "key": "THERMOMETRE",
"fr": "THERMOMETRE", "fr": "THERMOMÈTRE",
"en": "THERMOMETER" "en": "THERMOMETER"
}, },
{ {
...@@ -1061,7 +1061,7 @@ ...@@ -1061,7 +1061,7 @@
}, },
{ {
"key": "VELO", "key": "VELO",
"fr": "VELO", "fr": "VÉLO",
"en": "BIKE" "en": "BIKE"
}, },
{ {
...@@ -1086,7 +1086,7 @@ ...@@ -1086,7 +1086,7 @@
}, },
{ {
"key": "ZEBRE", "key": "ZEBRE",
"fr": "ZEBRE", "fr": "ZÈBRE",
"en": "ZEBRA" "en": "ZEBRA"
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment