summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja/strings.xml
AgeCommit message (Collapse)Author
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-11SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-06SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-11-05SL-16320 Remove obsolete AvaLine stringsAndrey Kleshchev
2021-07-19SL-15592 Emergency login failure dialogAndrey Kleshchev
Server message by id "LoginFailure" was pulling in header instead of a message
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp
2020-09-17Remove references to VFS in the non-English language XML files (already ↵Callum Prentice
removed from English (en) versions)
2020-05-19SL-13270 Pull translations into the corresponding xml files.Mnikolenko Productengine
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2019-10-23Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-16mergeBrad Payne (Vir Linden)
2019-09-09FIX INTL-367 Translation update for Set59 (EEP Viewer, DRTVWR-440)eli
2019-07-18FIX INTL-355 translation of Set58 for 9 languages, for project repo ↵eli
483-legacy_profiles
2019-05-27Merged in eli_linden/eli_viewer-lynxAndreyL ProductEngine
2019-05-26FIX INTL-351 translation update for 9 languages for viewer-lynxeli
2019-05-21Merge viewer-release 6.2.3Graham Linden
2019-05-17SL-11213 No longer embedding the channel in the viewer release note urls. ↵Steven Harrison (steven)
Update base URLs to match new viewer release note URL
2019-05-08Merge viewer-releaseGraham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merged in lindenlab/viewer-release (EAM)AndreyL ProductEngine
2019-04-15FIX INTL-336 Viewer translation for 9 languages (Set 56) for viewer-beareli
2019-01-10FIX INTL-324 Viewer Set55 translation (viewer-neko)eli
2018-12-15Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-12-13MergeRider Linden
2018-12-03FIX INTL-316 translate Viewer Set54 into 9 languages, for Animesh project ↵eli
Viewer (repository: axon)
2018-10-18FIX INTL-307 Translate Viewer Set53 into 9 languages (viewer-eep)eli
2018-09-27Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-09-26MergeRider Linden
2018-09-06FIX INTL-302 translation of Viewer Set52 (DRTVWR-461: viewer-estate-access)eli
2018-07-31MAINT-8931 FIXED Render quality value in About Second Life is misleadingmaxim_productengine
2018-06-27MAINT-8011 make newly created Sky, Water, etc create a system folder with ↵Graham Linden
proper icon Add entries to strings.xml for all langs for the "settings" string.
2018-05-09Merged in lindenlab/viewer-451AndreyL ProductEngine
2018-01-08FIX INTL-275 translations in 9 languages for viewer64 (DRTVWR-418)eli
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-10-17FIX INTL-264 translations in 9 languages for Viewer Set48 on repository ↵eli
viewer-bear
2017-05-22Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-04-18FIX INTL-247 translations for 9 languages for viewer-lynx (DRTVWR-432)eli
2017-03-10Fix for MAINT-7047 No information about 32bit or 64bit version of 'Project ↵Callum Prentice
Alex Ivy' viewer in non-English locales
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 22:53:04 +0000