Merging with default

This commit is contained in:
Yann 2016-01-29 23:13:45 +01:00
commit 820a4656fc
4 changed files with 40 additions and 28 deletions

View file

@ -13837,21 +13837,25 @@ uiTheSeasonIs [It's ]
// INDEX 3276 // INDEX 3276
uiAndTheWeatherIs [ and the weather is ] uiAndTheWeatherIs [ and the weather is ]
// HASH_VALUE A969C4866B77A0A1 /* OLD VALUE : [Spring] */
// HASH_VALUE 28DAACAF6DB9C0B8
// INDEX 3277 // INDEX 3277
uiSeason0 [Spring] uiSeason0 [vensa]
// HASH_VALUE AF372878B1961C8A /* OLD VALUE : [Summer] */
// HASH_VALUE 2A2A80A9AA09A8A0
// INDEX 3278 // INDEX 3278
uiSeason1 [Summer] uiSeason1 [crisa]
// HASH_VALUE B2783863B2451C8F /* OLD VALUE : [Autumn] */
// HASH_VALUE 703AD0BEEB4AFCB5
// INDEX 3279 // INDEX 3279
uiSeason2 [Autumn] uiSeason2 [critu]
// HASH_VALUE 3097E4816D26088F /* OLD VALUE : [Winter] */
// HASH_VALUE ECAAA4ACAD99B4A5
// INDEX 3280 // INDEX 3280
uiSeason3 [Winter] uiSeason3 [dunra]
// HASH_VALUE A44ECD02D7D4B358 // HASH_VALUE A44ECD02D7D4B358
// INDEX 3281 // INDEX 3281

View file

@ -13858,21 +13858,25 @@ uiTheSeasonIs [Nous sommes ]
// INDEX 3276 // INDEX 3276
uiAndTheWeatherIs [ et ] uiAndTheWeatherIs [ et ]
// HASH_VALUE A969C4866B77A0A1 /* OLD VALUE : [au Printemps] */
// HASH_VALUE 28DAACAF6DB9C0B8
// INDEX 3277 // INDEX 3277
uiSeason0 [au Printemps] uiSeason0 [vensa]
// HASH_VALUE AF372878B1961C8A /* OLD VALUE : [en Eté] */
// HASH_VALUE 2A2A80A9AA09A8A0
// INDEX 3278 // INDEX 3278
uiSeason1 [en Eté] uiSeason1 [crisa]
// HASH_VALUE B2783863B2451C8F /* OLD VALUE : [en Automne] */
// HASH_VALUE 703AD0BEEB4AFCB5
// INDEX 3279 // INDEX 3279
uiSeason2 [en Automne] uiSeason2 [critu]
// HASH_VALUE 3097E4816D26088F /* OLD VALUE : [en Hiver] */
// HASH_VALUE ECAAA4ACAD99B4A5
// INDEX 3280 // INDEX 3280
uiSeason3 [en Hiver] uiSeason3 [dunra]
// HASH_VALUE A44ECD02D7D4B358 // HASH_VALUE A44ECD02D7D4B358
// INDEX 3281 // INDEX 3281

View file

@ -13838,21 +13838,25 @@ uiTheSeasonIs [It's ]
// INDEX 3276 // INDEX 3276
uiAndTheWeatherIs [ and the weather is ] uiAndTheWeatherIs [ and the weather is ]
// HASH_VALUE A969C4866B77A0A1 /* OLD VALUE : [vensa] */
// HASH_VALUE 28DAACAF6DB9C0B8
// INDEX 3277 // INDEX 3277
uiSeason0 [Spring] uiSeason0 [vensa]
// HASH_VALUE AF372878B1961C8A /* OLD VALUE : [crisa] */
// HASH_VALUE 2A2A80A9AA09A8A0
// INDEX 3278 // INDEX 3278
uiSeason1 [Summer] uiSeason1 [crisa]
// HASH_VALUE B2783863B2451C8F /* OLD VALUE : [critu] */
// HASH_VALUE 703AD0BEEB4AFCB5
// INDEX 3279 // INDEX 3279
uiSeason2 [Autumn] uiSeason2 [critu]
// HASH_VALUE 3097E4816D26088F /* OLD VALUE : [dunra] */
// HASH_VALUE ECAAA4ACAD99B4A5
// INDEX 3280 // INDEX 3280
uiSeason3 [Winter] uiSeason3 [dunra]
// HASH_VALUE A44ECD02D7D4B358 // HASH_VALUE A44ECD02D7D4B358
// INDEX 3281 // INDEX 3281

View file

@ -4021,10 +4021,10 @@ uiHumidity [Humidity]
uiWind [Wind] uiWind [Wind]
uiTheSeasonIs [It's ] uiTheSeasonIs [It's ]
uiAndTheWeatherIs [ and the weather is ] uiAndTheWeatherIs [ and the weather is ]
uiSeason0 [Spring] uiSeason0 [vensa]
uiSeason1 [Summer] uiSeason1 [crisa]
uiSeason2 [Autumn] uiSeason2 [critu]
uiSeason3 [Winter] uiSeason3 [dunra]
uiCommandWrongArgumentCount [Wrong argument count in the command.] uiCommandWrongArgumentCount [Wrong argument count in the command.]
uittRun [Run Mode] uittRun [Run Mode]
uittWalk [Walking Mode] uittWalk [Walking Mode]