summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/fr
AgeCommit message (Collapse)Author
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-03SL-16434 Fix menu localizationAndrey Kleshchev
2021-11-29DRTVWR-542 merge, purge GLOD copyrights from xmlDave Houlton
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-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.
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-17Remove references to VFS in the non-English language XML files (already ↵Callum Prentice
removed from English (en) versions)
2020-05-28SL-13239 Add 'Touch' to the various attachment context menusMnikolenko Productengine
2020-05-22SL-13190 Allow Edit Attached Object Position From InventoryMnikolenko Productengine
2020-05-19SL-13270 Pull translations into the corresponding xml files.Mnikolenko Productengine
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-02-18SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlapsAndrey Kleshchev
2020-02-17SL-11867 Show “Unable to buy” message via notificationmaxim_productengine
2020-02-03Merge branch 'DRTVWR-501' into trunkAndrey Lihatskiy
2020-01-30SL-12598 FIXED The buttons have cropped names in the 'Preferences' floatermaxim_productengine
2020-01-29SL-12594, remove the Basic Shaders checkbox from the guiDave Houlton
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-12-19SL-209 Removed obsolete localization filesandreykproductengine
2019-10-16mergeBrad Payne (Vir Linden)
2019-09-18SL-11921 FIXED Some translations overlap the 'About Land' and 'Preferences' UImaxim_productengine
2019-09-09FIX INTL-367 Translation update for Set59 (EEP Viewer, DRTVWR-440)eli
2019-09-05SL-11867 FIXED [ES][FR][IT] The text “Unable to buy” goes beyond the ↵maxim_productengine
description area
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-21Merged in lindenlab/viewer-bearAndreyL ProductEngine
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-17Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-04-15FIX INTL-336 Viewer translation for 9 languages (Set 56) for viewer-beareli
2019-04-16Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02SL-10847 FIXED [French] llLoadUrl dialog wrongly adds '?' to URLmaxim_productengine
2019-02-15SL-10234 Fixed The viewer shows installation language as system defaultandreykproductengine
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-27Merged in lindenlab/viewer-releaseAndreyL ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 12:39:18 +0000