Age | Commit message (Collapse) | Author |
|
|
|
following promotion of DRTVWR-582
|
|
simulator
|
|
DRTVWR-577 (#232)
|
|
|
|
INTL-490 Japanese Translation Update
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
|
following promotion of DRTVWR-580
|
|
|
|
|
|
|
|
Changes do not appear to add anything sans mac's line ending which triggers coding policy protection and shouldn't be present in window's installer file.
|
|
to resolve conflicts in installer_template.nsi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Notecard
|
|
|
|
marchcat/SL-19669-upd
|
|
|
|
Translate untranslated parts of Preferences panel.
|
|
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/llcommon/tests/llsdserialize_test.cpp
# indra/newview/llmeshrepository.cpp
|
|
DRTVWR-580-maint-T
|
|
|
|
Chang 'water' translation '水' to '水面'.
Unify the ground translation with '地面' expect land floater.
Fixed mistranslation of widget.
Re-translate panel_settings_sky_density.xml.
|
|
|
|
|
|
from U32*.
|
|
(Add Performance floater translation etc.)
Changed 'lighting' translation ('照明' and 'ライティング') to '光源'.
Changed 'world' translation '世界' to 'ワールド'. (To be consistent with 'ミニマップ' translations.)
Adjusted the translation to be more natural Japanese when the settings.xml object passed items. (experimental)
|
|
|
|
|
|
|
|
|
|
provided by Logue Takacs
|
|
|
|
# Conflicts:
# indra/llcommon/llsdserialize.h
|
|
|
|
(cherry picked from commit eb0516b9940f200b32349d611f38f1ccee48005d)
|
|
|
|
|
|
|
|
|