Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
The "Start at:" combo box and the grid-selector box can be turned on and off
with checkboxes on the Preferences floater. Break the bottom-left layout_panel
on panel_login into several different layout_panels so when these UI elements
disappear, other controls move left to fill the holes. Similarly, when you
turn on either or both of the UI elements in question, the remaining controls
in that general bottom-left area move right to accommodate.
Tweak C++ and non-English panel_login.xml overrides to reflect widgets'
containment in new layout_panel elements.
Discard obsolete "mode_selection_text" and "mode_combo" translations from non-
English panel_login.xml overrides.
|
|
Revert to corresponding original login_help text for each affected language.
|
|
|
|
en/panel_login.xml had to be changed to enlarge certain fields for other
languages (rather than overriding sizes in each of several other languages).
Still need to translate new create_account_text and verify guessed log_in_text.
|
|
|
|
|
|
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
|
|
translation. for beta 5
|
|
|
|
|
|
1.23s UI
reviewed by Leyla
|
|
resident translations for PL (set1 thru set4),
resident translations for IT (set1 thru set6)
(I can promise this is the last weekend I work for LL. Peace Love & Hope 2010.)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22
DEV-38453 Conversion to 2.0: Modernize and rearrange the nodes of the localized XUI; NO CHANGES TO ENGLISH.
- match the new structures/widget language of the post-skinning work
- restore some strings.xml entries from the former ui_strings.xml file
- copy the Low/Mid/High translations into strings.xml
- strip out all superfluous length= and type= parameters; these default to the EN value anyway
I intentionally did not yet rearrange menu_viewer.xml, since it is still in flux in English
|
|
ignore-dead-branch
|
|
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22
Merge-back of non-voice related viewer 1.22 RC8 changes to trunk.
QAR-1242
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
|
|
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
|