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.
|
|
We already have a "create_account_url" string in strings.xml, and in fact --
according to Eli -- the strings.xml values are "better" for non-English
languages. Unfortunately those "better" strings weren't being used. They were
tied to the FirstRun notification, which seems to have been disengaged.
Changed llpanellogin.cpp to look in strings.xml rather than panel_login.xml
when clicking the "Sign Up" link on the login panel.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1.23s UI
reviewed by Leyla
|
|
|
|
wiki.
- DEV-43134 Insert localized hyperlinks for all places in XUI where viewer jumps to the web.
(This will be needed for Phase 4 Testing of QAR-1355)
|
|
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
|
|
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
|