diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
| commit | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (patch) | |
| tree | e2d49a6fe81f8fd9f0e8793112830d7b17d9068d /indra/newview/skins | |
| parent | f46526b16004e734d0a459e482ab9bb5df656c54 (diff) | |
| parent | 94744d4e5ec1bb8dfafa2c459ebc8fbf0b92a68a (diff) | |
merge changes for other open sourc contributions
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 24131495c3..506b110afe 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2481,8 +2481,9 @@ This is usually a temporary failure. Please customize and save the wearable agai icon="alertmodal.tga" name="YouHaveBeenLoggedOut" type="alertmodal"> -Darn. You have been logged out of [SECOND_LIFE] - [MESSAGE] +Darn. You have been logged out of [SECOND_LIFE]. + +[MESSAGE] <usetemplate name="okcancelbuttons" notext="Quit" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index f6665a1d5d..9da044ab64 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -39,7 +39,12 @@ enabled="true" label="English" name="English" - value="en" /> + value="en" /> + <combo_box.item + enabled="true" + label="Dansk (Danish) - Beta" + name="Danish" + value="da" /> <combo_box.item enabled="true" label="Deutsch (German) - Beta" @@ -59,7 +64,12 @@ enabled="true" label="Italiano (Italian) - Beta" name="Italian" - value="it" /> + value="it" /> + <combo_box.item + enabled="true" + label="Polski (Polish) - Beta" + name="Polish" + value="pl" /> <combo_box.item enabled="true" label="Português (Portuguese) - Beta" |