summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/notifications.xml
AgeCommit message (Collapse)Author
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-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-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-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-02-08Clean up UI scalingAnsariel
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-06FIX INTL-302 translation of Viewer Set52 (DRTVWR-461: viewer-estate-access)eli
2018-07-02FIX INTL-93 translate Viewer Set51 from viewer-bear, for 9 languageseli
2018-05-09Merged in lindenlab/viewer-451AndreyL ProductEngine
2018-02-15Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2018-01-08FIX INTL-275 translations in 9 languages for viewer64 (DRTVWR-418)eli
2017-11-29merge changes for 5.0.9-releaseOz Linden
2017-10-17FIX INTL-264 translations in 9 languages for Viewer Set48 on repository ↵eli
viewer-bear
2017-05-23merge changes for 5.0.5-releaseOz Linden
2017-04-18FIX INTL-247 translations for 9 languages for viewer-lynx (DRTVWR-432)eli
2017-02-27VOICE-46: allow longer connection timeout, with fewer retries. Clarify ports ↵Oz Linden
needed. Remove pointless in-progress notice
2017-01-06INTL-238 FIX translate Viewer Set46 for Repo viewer-lynx (DRTVWR-428)eli
2016-08-16FIX INTL-224 Viewer Set45 translation for bento-box in 9 languageseli
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-04-07OPEN-292: More removal of orphaned legacy script upload methodsAnsariel
2016-03-24FIX INTL-205 translation of Viewer Set44 for 9 languages (no Polish ↵eli
contribution this time), from 391-blizzard branch
2016-01-21MAINT-6050 Translations for the link changeAndreyL ProductEngine
2015-11-10remove execute permission from many files that should not have itOz Linden
2018-04-05FIX INTL-282 translations for Viewer Set50 (drtvwr-450 on repository ↵eli
viewer-lynx)
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-07-14translation file corrections from EliOz Linden
2015-07-14merge 3.8.0-release and correct xml errors caused by reformattingOz Linden
2015-07-07MAINT-4763 FIXED Remove NoValidTimestamp from viewerMnikolenko ProductEngine
2015-05-11FIX INTL-173 Viewer Set43 translation for project viewer-directdeliveryeli
2014-11-26FIX INTL-159 project Viewer translation for experience tools in 9 languageseli
2014-09-24FIX INTL-151 re-committed translation for Viewer Set41; this brings back ↵eli
missing translation after the last merge
2014-06-03FIX INTL-142 translations for Viewer Set40eli
2013-09-11FIX INTL-123 translation of Viewer Set36 for 9 languages (changed and new files)eli
2013-04-24merge changes for DRTVWR-309Oz Linden
2013-04-24FIX INTL-114 translation for 9 languages of major update from CHUI (based on ↵eli
latest merge with viewer-development)
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-03FIX INTL-114 translation for 9 languages of major update from CHUI and other ↵eli
projects
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-11-07INTL-46 massive Chinese translation update for set28--set34, including new fileseli
2012-09-04WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add ↵eli
new files