From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Fri, 22 May 2009 09:58:47 +0000 Subject: svn merge -r121194:121210 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk --- .../newview/skins/default/xui/nl/floater_about.xml | 2 +- .../skins/default/xui/nl/floater_about_land.xml | 252 +- .../skins/default/xui/nl/floater_bulk_perms.xml | 44 + .../skins/default/xui/nl/floater_buy_currency.xml | 16 +- .../skins/default/xui/nl/floater_buy_land.xml | 32 +- .../skins/default/xui/nl/floater_customize.xml | 148 +- .../skins/default/xui/nl/floater_font_test.xml | 6 + .../skins/default/xui/nl/floater_joystick.xml | 2 + .../skins/default/xui/nl/floater_perm_prefs.xml | 16 + .../skins/default/xui/nl/floater_report_abuse.xml | 18 +- .../skins/default/xui/nl/floater_sell_land.xml | 15 +- .../skins/default/xui/nl/floater_statistics.xml | 2 + .../newview/skins/default/xui/nl/floater_tools.xml | 84 +- .../skins/default/xui/nl/floater_world_map.xml | 31 +- .../skins/default/xui/nl/menu_inventory.xml | 1 + .../newview/skins/default/xui/nl/menu_mini_map.xml | 8 + indra/newview/skins/default/xui/nl/menu_viewer.xml | 14 +- .../newview/skins/default/xui/nl/notifications.xml | 8122 +++++++------------- .../skins/default/xui/nl/panel_group_general.xml | 12 +- .../skins/default/xui/nl/panel_group_invite.xml | 4 +- .../skins/default/xui/nl/panel_group_roles.xml | 2 +- .../skins/default/xui/nl/panel_region_general.xml | 23 +- indra/newview/skins/default/xui/nl/strings.xml | 73 +- .../skins/default/xui/nl/teleport_strings.xml | 8 +- 24 files changed, 3285 insertions(+), 5650 deletions(-) create mode 100644 indra/newview/skins/default/xui/nl/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/nl/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/nl/menu_mini_map.xml (limited to 'indra/newview/skins/default/xui/nl') diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml index 8801e5713c..d981ac2c8c 100644 --- a/indra/newview/skins/default/xui/nl/floater_about.xml +++ b/indra/newview/skins/default/xui/nl/floater_about.xml @@ -27,7 +27,7 @@ All rights reserved. See licenses.txt for details. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) -I get by with a little help from my friends. --Richard Starkey +To be a success in business, be daring, be first, be different. --Henry Marchant U bent op [POSITION] diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml index 2851fd1481..a3e3b246fe 100644 --- a/indra/newview/skins/default/xui/nl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml @@ -8,16 +8,29 @@ Omschrijving: + + Type: + + + Mainland / Homestead + + + Inhoudscategorie: + + + Adult + - Eigenaar + Eigenaar: - + Leyla Linden