Khaganat-NeL/khanat-ressources-NeL
2
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/character_screens' into 'lirria'

Browse source 
Minor change in UI terms - in accordance with  for khanat-code Issue 14 changes

Complément de https://git.khaganat.net/khaganat/khanat-code/merge_requests/24

See merge request !3
This commit is contained in:
deed 2016-10-10 19:44:13 +00:00
commit e6ef99943b
12 changed files with 82692 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20803
translation/history/en_57FA9BFF.uxt Normal file
View file

File diff suppressed because it is too large Load diff

9
translation/history/en_diff_57FA9BE4.uxt Normal file
View file

@ -0,0 +1,9 @@
// DIFF CHANGED 3372
/* OLD VALUE : [EMPTY SLOT] */
/* OLD VALUE : [EMPTY SLOT] */
// HASH_VALUE D272F03FCDC20042
// INDEX 0
uiCharSel_EmptySlot [EMPTY]
// REMOVE THE FOLOWING LINE WHEN TRANSLATION IS DONE

20680
translation/history/fr_57FA9BFF.uxt Normal file
View file

File diff suppressed because it is too large Load diff

9
translation/history/fr_diff_57FA9BE4.uxt Normal file
View file

@ -0,0 +1,9 @@
// DIFF CHANGED 3372
/* OLD VALUE : [EMPTY SLOT] */
/* OLD VALUE : [EMPLACEMENT LIBRE] */
// HASH_VALUE D272F03FCDC20042
// INDEX 0
uiCharSel_EmptySlot [LIBRE]
// REMOVE THE FOLOWING LINE WHEN TRANSLATION IS DONE

20573
translation/history/wk_57FA9BE1.uxt Normal file
View file

File diff suppressed because it is too large Load diff

20574
translation/history/wk_57FA9BFF.uxt Normal file
View file

File diff suppressed because it is too large Load diff

9
translation/history/wk_diff_57FA9BC6.uxt Normal file
View file

@ -0,0 +1,9 @@
// DIFF CHANGED 3372
/* OLD VALUE : [EMPTY SLOT] */
// HASH_VALUE D272F03FCDC20042
// INDEX 0
uiCharSel_EmptySlot [EMPTY]
// REMOVE THE FOLOWING LINE WHEN TRANSLATION IS DONE

23
translation/log.log
View file

@ -4793,3 +4793,26 @@ Log Starting [2016/09/14 22:04:11]
2016/09/14 22:04:11 DBG 1786890048 <Unknown> diff_tool.cpp 714 readExcelSheet : At line 0, numCol changed to 4 2016/09/14 22:04:11 DBG 1786890048 <Unknown> diff_tool.cpp 714 readExcelSheet : At line 0, numCol changed to 4
2016/09/14 22:04:11 DBG 1786890048 <Unknown> diff_tool.cpp 714 readExcelSheet : At line 0, numCol changed to 4 2016/09/14 22:04:11 DBG 1786890048 <Unknown> diff_tool.cpp 714 readExcelSheet : At line 0, numCol changed to 4
2016/09/14 22:04:11 DBG 1786890048 <Unknown> diff_tool.cpp 714 readExcelSheet : At line 0, numCol changed to 4 2016/09/14 22:04:11 DBG 1786890048 <Unknown> diff_tool.cpp 714 readExcelSheet : At line 0, numCol changed to 4
Log Starting [2016/10/09 21:34:30]
2016/10/09 21:34:30 INF 2940680000 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./work/, 1, 0): adding the path './work/'
2016/10/09 21:34:30 WRN 2940680000 <Unknown> path.cpp 1532 insertFileInMap : PATH: CPath::insertFileInMap(phrase_wk.txt, ./work/phrases/phrase_wk.txt, 0, txt): already inserted from './work/', skip it
2016/10/09 21:34:30 INF 2940680000 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./diff/, 1, 0): adding the path './diff/'
2016/10/09 21:34:30 INF 2940680000 <Unknown> main.cpp 463 onChanged : Changed uiCharSel_EmptySlot at 3372
Log Starting [2016/10/09 21:34:57]
2016/10/09 21:34:57 INF 695506752 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./work/, 1, 0): adding the path './work/'
2016/10/09 21:34:57 WRN 695506752 <Unknown> path.cpp 1532 insertFileInMap : PATH: CPath::insertFileInMap(phrase_wk.txt, ./work/phrases/phrase_wk.txt, 0, txt): already inserted from './work/', skip it
2016/10/09 21:34:57 INF 695506752 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./diff/, 1, 0): adding the path './diff/'
Log Starting [2016/10/09 21:35:00]
2016/10/09 21:35:00 INF 500250432 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./work/, 1, 0): adding the path './work/'
2016/10/09 21:35:00 WRN 500250432 <Unknown> path.cpp 1532 insertFileInMap : PATH: CPath::insertFileInMap(phrase_wk.txt, ./work/phrases/phrase_wk.txt, 0, txt): already inserted from './work/', skip it
2016/10/09 21:35:00 INF 500250432 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./diff/, 1, 0): adding the path './diff/'
2016/10/09 21:35:00 INF 500250432 <Unknown> main.cpp 463 onChanged : Changed uiCharSel_EmptySlot at 3372
2016/10/09 21:35:00 INF 500250432 <Unknown> main.cpp 463 onChanged : Changed uiCharSel_EmptySlot at 3372
Log Starting [2016/10/09 21:35:27]
2016/10/09 21:35:27 INF 1082918720 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./work/, 1, 0): adding the path './work/'
2016/10/09 21:35:27 WRN 1082918720 <Unknown> path.cpp 1532 insertFileInMap : PATH: CPath::insertFileInMap(phrase_wk.txt, ./work/phrases/phrase_wk.txt, 0, txt): already inserted from './work/', skip it
2016/10/09 21:35:27 INF 1082918720 <Unknown> path.cpp 1021 addSearchPath : PATH: CPath::addSearchPath(./diff/, 1, 0): adding the path './diff/'

6
translation/translated/en.uxt
View file

@ -14308,9 +14308,11 @@ uiCP_selection [SELECTION]
// INDEX 3371 // INDEX 3371
uiCP_creation [CREATION] uiCP_creation [CREATION]
// HASH_VALUE 908237408323573D /* OLD VALUE : [EMPTY SLOT] */
/* OLD VALUE : [EMPTY SLOT] */
// HASH_VALUE D272F03FCDC20042
// INDEX 3372 // INDEX 3372
uiCharSel_EmptySlot [EMPTY SLOT] uiCharSel_EmptySlot [EMPTY]
// HASH_VALUE 5850C4405850C440 // HASH_VALUE 5850C4405850C440
// INDEX 3373 // INDEX 3373

6
translation/translated/fr.uxt
View file

@ -14329,9 +14329,11 @@ uiCP_selection [SÉLECTION]
// INDEX 3371 // INDEX 3371
uiCP_creation [CRÉATION] uiCP_creation [CRÉATION]
// HASH_VALUE 908237408323573D /* OLD VALUE : [EMPTY SLOT] */
/* OLD VALUE : [EMPLACEMENT LIBRE] */
// HASH_VALUE D272F03FCDC20042
// INDEX 3372 // INDEX 3372
uiCharSel_EmptySlot [EMPLACEMENT LIBRE] uiCharSel_EmptySlot [LIBRE]
// HASH_VALUE 5850C4405850C440 // HASH_VALUE 5850C4405850C440
// INDEX 3373 // INDEX 3373

5
translation/translated/wk.uxt
View file

@ -14269,9 +14269,10 @@ uiCP_selection [SELECTION]
// INDEX 3371 // INDEX 3371
uiCP_creation [CREATION] uiCP_creation [CREATION]
// HASH_VALUE 908237408323573D /* OLD VALUE : [EMPTY SLOT] */
// HASH_VALUE D272F03FCDC20042
// INDEX 3372 // INDEX 3372
uiCharSel_EmptySlot [EMPTY SLOT] uiCharSel_EmptySlot [EMPTY]
// HASH_VALUE 5850C4405850C440 // HASH_VALUE 5850C4405850C440
// INDEX 3373 // INDEX 3373

2
translation/work/wk.uxt
View file

@ -4122,7 +4122,7 @@ uiCP_title1 [CHARACTER]
uiCP_title2 [DESTINATION] uiCP_title2 [DESTINATION]
uiCP_selection [SELECTION] uiCP_selection [SELECTION]
uiCP_creation [CREATION] uiCP_creation [CREATION]
uiCharSel_EmptySlot [EMPTY SLOT] uiCharSel_EmptySlot [EMPTY]
uiCharSel_Play [PLAY] uiCharSel_Play [PLAY]
uiCharSel_Del [DELETE] uiCharSel_Del [DELETE]
uiCharSel_CreateNew [CREATE NEW] uiCharSel_CreateNew [CREATE NEW]