From 446c55538e1fb12d8a1feb541edf99c16bb29121 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Tue, 13 Jan 2009 03:46:56 +0000 Subject: svn merge -r106055-107012 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. --- .../skins/default/xui/da/floater_about_land.xml | 4 +- .../skins/default/xui/da/floater_buy_currency.xml | 6 +- .../skins/default/xui/da/floater_buy_land.xml | 12 +- indra/newview/skins/default/xui/da/floater_pay.xml | 4 +- .../default/xui/da/panel_preferences_general.xml | 2 +- .../skins/default/xui/de/floater_beacons.xml | 15 + .../default/xui/de/panel_group_land_money.xml | 2 +- .../default/xui/de/panel_preferences_general.xml | 2 +- .../default/xui/es/panel_group_land_money.xml | 4 +- .../default/xui/es/panel_preferences_general.xml | 2 +- .../skins/default/xui/fr/floater_about_land.xml | 2 +- .../skins/default/xui/fr/floater_beacons.xml | 15 + indra/newview/skins/default/xui/fr/floater_pay.xml | 2 +- .../newview/skins/default/xui/fr/floater_tools.xml | 6 +- indra/newview/skins/default/xui/fr/menu_viewer.xml | 2 +- .../default/xui/fr/panel_group_land_money.xml | 2 +- .../default/xui/fr/panel_preferences_general.xml | 2 +- .../skins/default/xui/ja/floater_beacons.xml | 15 + .../skins/default/xui/ja/floater_customize.xml | 6 +- .../skins/default/xui/ja/floater_inventory.xml | 6 +- .../xui/ja/floater_inventory_item_properties.xml | 8 +- .../skins/default/xui/ja/menu_inventory.xml | 8 +- .../default/xui/ja/panel_preferences_general.xml | 2 +- .../skins/default/xui/pl/floater_about_land.xml | 22 +- .../skins/default/xui/pl/floater_avatar_picker.xml | 2 +- .../skins/default/xui/pl/floater_beacons.xml | 8 +- .../skins/default/xui/pl/floater_buy_currency.xml | 9 +- .../skins/default/xui/pl/floater_buy_land.xml | 10 +- .../skins/default/xui/pl/floater_color_picker.xml | 2 +- .../skins/default/xui/pl/floater_critical.xml | 2 +- .../skins/default/xui/pl/floater_customize.xml | 65 ++-- .../default/xui/pl/floater_day_cycle_options.xml | 4 +- .../default/xui/pl/floater_hardware_settings.xml | 6 +- .../skins/default/xui/pl/floater_image_preview.xml | 10 +- .../skins/default/xui/pl/floater_inspect.xml | 4 +- .../skins/default/xui/pl/floater_joystick.xml | 2 +- .../skins/default/xui/pl/floater_land_holdings.xml | 2 +- .../default/xui/pl/floater_live_lsleditor.xml | 4 +- .../skins/default/xui/pl/floater_media_browser.xml | 2 +- indra/newview/skins/default/xui/pl/floater_pay.xml | 3 +- .../skins/default/xui/pl/floater_pay_object.xml | 23 +- .../default/xui/pl/floater_preview_animation.xml | 4 +- .../skins/default/xui/pl/floater_report_abuse.xml | 20 +- .../skins/default/xui/pl/floater_snapshot.xml | 4 +- .../newview/skins/default/xui/pl/floater_tools.xml | 44 +-- .../skins/default/xui/pl/floater_url_entry.xml | 2 +- indra/newview/skins/default/xui/pl/menu_viewer.xml | 12 +- .../newview/skins/default/xui/pl/panel_friends.xml | 12 +- .../default/xui/pl/panel_group_land_money.xml | 2 +- indra/newview/skins/default/xui/pl/panel_login.xml | 2 +- .../default/xui/pl/panel_preferences_general.xml | 6 +- .../skins/default/xui/pl/panel_region_debug.xml | 2 +- indra/newview/skins/default/xui/pl/strings.xml | 8 +- .../skins/default/xui/pt/floater_about_land.xml | 17 +- .../skins/default/xui/pt/floater_beacons.xml | 15 + .../skins/default/xui/pt/floater_buy_currency.xml | 8 +- .../skins/default/xui/pt/floater_buy_land.xml | 2 +- .../skins/default/xui/pt/floater_camera.xml | 12 + .../skins/default/xui/pt/floater_color_picker.xml | 5 +- .../skins/default/xui/pt/floater_customize.xml | 68 +++- .../default/xui/pt/floater_day_cycle_options.xml | 67 ++++ .../skins/default/xui/pt/floater_env_settings.xml | 23 ++ .../default/xui/pt/floater_hardware_settings.xml | 38 ++ indra/newview/skins/default/xui/pt/floater_hud.xml | 2 + .../skins/default/xui/pt/floater_image_preview.xml | 4 +- .../skins/default/xui/pt/floater_lagmeter.xml | 152 ++++++++ .../skins/default/xui/pt/floater_media_browser.xml | 20 + .../skins/default/xui/pt/floater_mem_leaking.xml | 12 + .../skins/default/xui/pt/floater_mute_object.xml | 11 + .../skins/default/xui/pt/floater_openobject.xml | 4 +- indra/newview/skins/default/xui/pt/floater_pay.xml | 12 +- .../skins/default/xui/pt/floater_pay_object.xml | 23 +- .../skins/default/xui/pt/floater_postcard.xml | 6 +- .../default/xui/pt/floater_preview_animation.xml | 4 +- .../default/xui/pt/floater_preview_classified.xml | 2 + .../skins/default/xui/pt/floater_preview_event.xml | 2 + .../skins/default/xui/pt/floater_region_info.xml | 2 + .../skins/default/xui/pt/floater_url_entry.xml | 12 + .../newview/skins/default/xui/pt/floater_water.xml | 85 +++++ .../default/xui/pt/floater_windlight_options.xml | 186 +++++++++ indra/newview/skins/default/xui/pt/menu_login.xml | 13 + indra/newview/skins/default/xui/pt/menu_slurl.xml | 6 + indra/newview/skins/default/xui/pt/mime_types.xml | 230 +++++++++++ .../skins/default/xui/pt/panel_audio_device.xml | 15 + .../newview/skins/default/xui/pt/panel_friends.xml | 14 + .../default/xui/pt/panel_group_land_money.xml | 2 +- .../default/xui/pt/panel_preferences_chat.xml | 7 +- .../default/xui/pt/panel_preferences_general.xml | 10 +- .../default/xui/pt/panel_preferences_graphics1.xml | 8 +- indra/newview/skins/default/xui/pt/strings.xml | 421 +++++++++++++++++++++ 90 files changed, 1687 insertions(+), 260 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_beacons.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_beacons.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_beacons.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_beacons.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_camera.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_env_settings.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_hardware_settings.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_hud.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_lagmeter.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_media_browser.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_mem_leaking.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_mute_object.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_preview_classified.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_preview_event.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_region_info.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_url_entry.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_water.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_windlight_options.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_login.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_slurl.xml create mode 100644 indra/newview/skins/default/xui/pt/mime_types.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_audio_device.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_friends.xml create mode 100644 indra/newview/skins/default/xui/pt/strings.xml (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml index 7163b149e8..3612797a7f 100644 --- a/indra/newview/skins/default/xui/da/floater_about_land.xml +++ b/indra/newview/skins/default/xui/da/floater_about_land.xml @@ -359,10 +359,10 @@ Indstillinger: - + Medie Størrelse: - + pixels diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml index cc408de572..a1150d173b 100644 --- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml @@ -53,10 +53,12 @@ L$ [AMT] - Der er sket en fejl, og købet er afbrudt. Forsøg venligst igen. + Der er sket en fejl, og købet er afbrudt. +Forsøg venligst igen. - Du køber ikke nok valuta, tast et større beløb og prøv igen. + Du køber ikke nok valuta, tast et større beløb +og prøv igen.