Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.wordguessing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
android
org.benoitharrault.wordguessing
Commits
f9d30b53
Commit
f9d30b53
authored
4 years ago
by
Benoît Harrault
Browse files
Options
Downloads
Plain Diff
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
!34
Resolve "Add accents and diacritics in french words"
Pipeline
#1101
passed
4 years ago
Stage: update
Stage: build-debug
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
android/gradle.properties
+2
-2
2 additions, 2 deletions
android/gradle.properties
assets/files/words.json
+29
-29
29 additions, 29 deletions
assets/files/words.json
with
31 additions
and
31 deletions
android/gradle.properties
+
2
−
2
View file @
f9d30b53
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
=
2
7
app.versionCode
=
2
8
This diff is collapsed.
Click to expand it.
assets/files/words.json
+
29
−
29
View file @
f9d30b53
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
},
},
{
{
"key"
:
"ARAIGNEE"
,
"key"
:
"ARAIGNEE"
,
"fr"
:
"ARAIGN
E
E"
,
"fr"
:
"ARAIGN
É
E"
,
"en"
:
"SPIDER"
"en"
:
"SPIDER"
},
},
{
{
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
},
},
{
{
"key"
:
"BALANCOIRE"
,
"key"
:
"BALANCOIRE"
,
"fr"
:
"BALAN
C
OIRE"
,
"fr"
:
"BALAN
Ç
OIRE"
,
"en"
:
"SWING"
"en"
:
"SWING"
},
},
{
{
...
@@ -121,7 +121,7 @@
...
@@ -121,7 +121,7 @@
},
},
{
{
"key"
:
"BEBE"
,
"key"
:
"BEBE"
,
"fr"
:
"B
EBE
"
,
"fr"
:
"B
ÉBÉ
"
,
"en"
:
"BABY"
"en"
:
"BABY"
},
},
{
{
...
@@ -181,7 +181,7 @@
...
@@ -181,7 +181,7 @@
},
},
{
{
"key"
:
"BUCHE"
,
"key"
:
"BUCHE"
,
"fr"
:
"B
U
CHE"
,
"fr"
:
"B
Û
CHE"
,
"en"
:
"LOG"
"en"
:
"LOG"
},
},
{
{
...
@@ -191,12 +191,12 @@
...
@@ -191,12 +191,12 @@
},
},
{
{
"key"
:
"CAFE"
,
"key"
:
"CAFE"
,
"fr"
:
"CAF
E
"
,
"fr"
:
"CAF
É
"
,
"en"
:
"COFFEE"
"en"
:
"COFFEE"
},
},
{
{
"key"
:
"CAFETIERE"
,
"key"
:
"CAFETIERE"
,
"fr"
:
"CAFETI
E
RE"
,
"fr"
:
"CAFETI
È
RE"
,
"en"
:
"COFFEE MAKER"
"en"
:
"COFFEE MAKER"
},
},
{
{
...
@@ -266,7 +266,7 @@
...
@@ -266,7 +266,7 @@
},
},
{
{
"key"
:
"CHEMINEE"
,
"key"
:
"CHEMINEE"
,
"fr"
:
"CHEMIN
E
E"
,
"fr"
:
"CHEMIN
É
E"
,
"en"
:
"CHIMNEY"
"en"
:
"CHIMNEY"
},
},
{
{
...
@@ -381,17 +381,17 @@
...
@@ -381,17 +381,17 @@
},
},
{
{
"key"
:
"ECHELLE"
,
"key"
:
"ECHELLE"
,
"fr"
:
"
E
CHELLE"
,
"fr"
:
"
É
CHELLE"
,
"en"
:
"LADDER"
"en"
:
"LADDER"
},
},
{
{
"key"
:
"ECUREUIL"
,
"key"
:
"ECUREUIL"
,
"fr"
:
"
E
CUREUIL"
,
"fr"
:
"
É
CUREUIL"
,
"en"
:
"SQUIRREL"
"en"
:
"SQUIRREL"
},
},
{
{
"key"
:
"ELEPHANT"
,
"key"
:
"ELEPHANT"
,
"fr"
:
"
ELE
PHANT"
,
"fr"
:
"
ÉLÉ
PHANT"
,
"en"
:
"ELEPHANT"
"en"
:
"ELEPHANT"
},
},
{
{
...
@@ -406,12 +406,12 @@
...
@@ -406,12 +406,12 @@
},
},
{
{
"key"
:
"EVIER"
,
"key"
:
"EVIER"
,
"fr"
:
"
E
VIER"
,
"fr"
:
"
É
VIER"
,
"en"
:
"SINK"
"en"
:
"SINK"
},
},
{
{
"key"
:
"FENETRE"
,
"key"
:
"FENETRE"
,
"fr"
:
"FEN
E
TRE"
,
"fr"
:
"FEN
Ê
TRE"
,
"en"
:
"WINDOW"
"en"
:
"WINDOW"
},
},
{
{
...
@@ -421,7 +421,7 @@
...
@@ -421,7 +421,7 @@
},
},
{
{
"key"
:
"FLUTE"
,
"key"
:
"FLUTE"
,
"fr"
:
"FL
U
TE"
,
"fr"
:
"FL
Û
TE"
,
"en"
:
"FLUTE"
"en"
:
"FLUTE"
},
},
{
{
...
@@ -451,7 +451,7 @@
...
@@ -451,7 +451,7 @@
},
},
{
{
"key"
:
"FUSEE"
,
"key"
:
"FUSEE"
,
"fr"
:
"FUS
E
E"
,
"fr"
:
"FUS
É
E"
,
"en"
:
"ROCKET"
"en"
:
"ROCKET"
},
},
{
{
...
@@ -486,7 +486,7 @@
...
@@ -486,7 +486,7 @@
},
},
{
{
"key"
:
"GUEPE"
,
"key"
:
"GUEPE"
,
"fr"
:
"GU
E
PE"
,
"fr"
:
"GU
Ê
PE"
,
"en"
:
"WASP"
"en"
:
"WASP"
},
},
{
{
...
@@ -501,7 +501,7 @@
...
@@ -501,7 +501,7 @@
},
},
{
{
"key"
:
"HELICOPTERE"
,
"key"
:
"HELICOPTERE"
,
"fr"
:
"H
E
LICOPT
E
RE"
,
"fr"
:
"H
É
LICOPT
È
RE"
,
"en"
:
"HELICOPTER"
"en"
:
"HELICOPTER"
},
},
{
{
...
@@ -606,12 +606,12 @@
...
@@ -606,12 +606,12 @@
},
},
{
{
"key"
:
"MESANGE"
,
"key"
:
"MESANGE"
,
"fr"
:
"M
E
SANGE"
,
"fr"
:
"M
É
SANGE"
,
"en"
:
"TITMOUSE"
"en"
:
"TITMOUSE"
},
},
{
{
"key"
:
"METRO"
,
"key"
:
"METRO"
,
"fr"
:
"M
E
TRO"
,
"fr"
:
"M
É
TRO"
,
"en"
:
"METRO"
"en"
:
"METRO"
},
},
{
{
...
@@ -696,12 +696,12 @@
...
@@ -696,12 +696,12 @@
},
},
{
{
"key"
:
"PATES"
,
"key"
:
"PATES"
,
"fr"
:
"P
A
TES"
,
"fr"
:
"P
Â
TES"
,
"en"
:
"PASTA"
"en"
:
"PASTA"
},
},
{
{
"key"
:
"PECHE"
,
"key"
:
"PECHE"
,
"fr"
:
"P
E
CHE"
,
"fr"
:
"P
Ê
CHE"
,
"en"
:
"FISHING"
"en"
:
"FISHING"
},
},
{
{
...
@@ -811,7 +811,7 @@
...
@@ -811,7 +811,7 @@
},
},
{
{
"key"
:
"POUPEE"
,
"key"
:
"POUPEE"
,
"fr"
:
"POUP
E
E"
,
"fr"
:
"POUP
É
E"
,
"en"
:
"DOLL"
"en"
:
"DOLL"
},
},
{
{
...
@@ -846,7 +846,7 @@
...
@@ -846,7 +846,7 @@
},
},
{
{
"key"
:
"RATEAU"
,
"key"
:
"RATEAU"
,
"fr"
:
"R
A
TEAU"
,
"fr"
:
"R
Â
TEAU"
,
"en"
:
"RAKE"
"en"
:
"RAKE"
},
},
{
{
...
@@ -861,12 +861,12 @@
...
@@ -861,12 +861,12 @@
},
},
{
{
"key"
:
"REVEIL"
,
"key"
:
"REVEIL"
,
"fr"
:
"R
E
VEIL"
,
"fr"
:
"R
É
VEIL"
,
"en"
:
"ALARM CLOCK"
"en"
:
"ALARM CLOCK"
},
},
{
{
"key"
:
"RHINOCEROS"
,
"key"
:
"RHINOCEROS"
,
"fr"
:
"RHINOC
E
ROS"
,
"fr"
:
"RHINOC
É
ROS"
,
"en"
:
"RHINOCEROS"
"en"
:
"RHINOCEROS"
},
},
{
{
...
@@ -981,17 +981,17 @@
...
@@ -981,17 +981,17 @@
},
},
{
{
"key"
:
"TELEPHONE"
,
"key"
:
"TELEPHONE"
,
"fr"
:
"T
ELE
PHONE"
,
"fr"
:
"T
ÉLÉ
PHONE"
,
"en"
:
"TELEPHONE"
"en"
:
"TELEPHONE"
},
},
{
{
"key"
:
"TELEVISION"
,
"key"
:
"TELEVISION"
,
"fr"
:
"T
ELE
VISION"
,
"fr"
:
"T
ÉLÉ
VISION"
,
"en"
:
"TELEVISION"
"en"
:
"TELEVISION"
},
},
{
{
"key"
:
"THERMOMETRE"
,
"key"
:
"THERMOMETRE"
,
"fr"
:
"THERMOM
E
TRE"
,
"fr"
:
"THERMOM
È
TRE"
,
"en"
:
"THERMOMETER"
"en"
:
"THERMOMETER"
},
},
{
{
...
@@ -1061,7 +1061,7 @@
...
@@ -1061,7 +1061,7 @@
},
},
{
{
"key"
:
"VELO"
,
"key"
:
"VELO"
,
"fr"
:
"V
E
LO"
,
"fr"
:
"V
É
LO"
,
"en"
:
"BIKE"
"en"
:
"BIKE"
},
},
{
{
...
@@ -1086,7 +1086,7 @@
...
@@ -1086,7 +1086,7 @@
},
},
{
{
"key"
:
"ZEBRE"
,
"key"
:
"ZEBRE"
,
"fr"
:
"Z
E
BRE"
,
"fr"
:
"Z
È
BRE"
,
"en"
:
"ZEBRA"
"en"
:
"ZEBRA"
},
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment