diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
48 files changed, 595 insertions, 289 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index 5702d48e97..624c6634cc 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -4,7 +4,6 @@ Sprog: </text> <combo_box name="language_combobox"> - <combo_box.item label="System standard" name="System Default Language"/> <combo_box.item label="English (Engelsk)" name="English"/> <combo_box.item label="Dansk - Beta" name="Danish"/> <combo_box.item label="Deutsch (Tysk) - Beta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml index 27c6b73967..2422e414e0 100644 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml @@ -96,7 +96,7 @@ </combo_box> <check_box label="Begehbare Objekte" name="show_walkables"/> <check_box label="Materialvolumen" name="show_material_volumes"/> - <check_box label="Statische Hinternisse" name="show_static_obstacles"/> + <check_box label="Statische Hindernisse" name="show_static_obstacles"/> <check_box label="Ausschlussvolumen" name="show_exclusion_volumes"/> <check_box label="Wasserebene" name="show_water_plane"/> <check_box label="Mit Röntgenblick" name="show_xray"/> diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml index a423f3efea..6729e242ac 100644 --- a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml @@ -61,10 +61,10 @@ Begehbar </floater.string> <floater.string name="linkset_use_static_obstacle"> - Statisches Hinternis + Statisches Hindernis </floater.string> <floater.string name="linkset_use_dynamic_obstacle"> - Bewegliches Hinternis + Bewegliches Hindernis </floater.string> <floater.string name="linkset_use_material_volume"> Materialvolumen @@ -103,8 +103,8 @@ <combo_box name="filter_by_linkset_use"> <combo_box.item label="Nach Linkset-Nutzung filtern..." name="filter_by_linkset_use_none"/> <combo_box.item label="Begehbar" name="filter_by_linkset_use_walkable"/> - <combo_box.item label="Statisches Hinternis" name="filter_by_linkset_use_static_obstacle"/> - <combo_box.item label="Bewegliches Hinternis" name="filter_by_linkset_use_dynamic_obstacle"/> + <combo_box.item label="Statisches Hindernis" name="filter_by_linkset_use_static_obstacle"/> + <combo_box.item label="Bewegliches Hindernis" name="filter_by_linkset_use_dynamic_obstacle"/> <combo_box.item label="Materialvolumen" name="filter_by_linkset_use_material_volume"/> <combo_box.item label="Ausschlussvolumen" name="filter_by_linkset_use_exclusion_volume"/> <combo_box.item label="Bewegliches Phantom" name="filter_by_linkset_use_dynamic_phantom"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 94ec441b15..3da2bb5c3c 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -244,6 +244,10 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut. Hinweis: Bei Aktivierung dieser Option sehen alle Personen, die diesen Computer benutzen, Ihre Lieblingsorte. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + Das Starten mehrerer Second Life Viewer wird nicht unterstützt. Dies kann zu Kollisionen des Textur-Caches, Fehlern sowie verschlechterter Grafik und Leistung führen. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Wenn Sie einem anderen Einwohner Änderungsrechte gewähren, dann kann dieser JEDES Objekt, das Sie inworld besitzen, ändern, löschen oder an sich nehmen. Seien Sie daher beim Gewähren dieser Rechte sehr vorsichtig! Möchten Sie [NAME] Änderungsrechte gewähren? @@ -725,9 +729,9 @@ Sie können die Grafikqualität unter Einstellungen > Grafik wieder erhöhen. Sie sind nicht zum Terraformen der Parzelle „[PARCEL]“ berechtigt. </notification> <notification name="CannotCopyWarning"> - Sie sind nicht berechtigt, die folgenden Objekte zu kopieren: -[ITEMS] -Wenn Sie diese weitergeben, werden sie aus Ihrem Inventar entfernt. Möchten Sie diese Objekte wirklich weggeben? + Sie sind nicht berechtigt, die folgenden Objekte zu kopieren: +<nolink>[ITEMS]</nolink> +und die Objekte werden aus Ihrem Inventar gelöscht, wenn Sie diese weggeben. Möchten Sie diese Objekte wirklich weggeben? <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> </notification> <notification name="CannotGiveItem"> @@ -3726,13 +3730,13 @@ es sich nicht in der gleichen Region befindet wie Sie. Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen. </notification> <notification name="NoCopyPermsNoObject"> - Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen. + Kopieren fehlgeschlagen, da Sie nicht über die Berechtigung zum Kopieren des Objekts <nolink>'[OBJ_NAME]'</nolink> verfügen. </notification> <notification name="NoTransPermsNoObject"> - Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann. + Kopieren fehlgeschlagen, da das Objekt <nolink>'[OBJ_NAME]'</nolink> nicht an Sie übertragen werden kann. </notification> <notification name="AddToNavMeshNoCopy"> - Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt. + Kopieren fehlgeschlagen, da das Objekt <nolink>'[OBJ_NAME]'</nolink> zum Navmesh beiträgt. </notification> <notification name="DupeWithNoRootsSelected"> Ohne ausgewählte Hauptobjekte duplizieren. @@ -3777,34 +3781,34 @@ Warten Sie kurz und versuchen Sie es noch einmal. Erneutes Speichern im Inventar ist deaktiviert. </notification> <notification name="NoExistNoSaveToContents"> - „[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert. + <nolink>'[OBJ_NAME]'</nolink> kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert. </notification> <notification name="NoModNoSaveToContents"> - „[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen. + <nolink>'[OBJ_NAME]'</nolink> kann nicht in Objektinhalt gespeichert werden, da Sie nicht über die Berechtigung zum Modifizieren des Objekts <nolink>'[DEST_NAME]'</nolink> verfügen. </notification> <notification name="NoSaveBackToInvDisabled"> - „[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert. + <nolink>'[OBJ_NAME]'</nolink> kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert. </notification> <notification name="NoCopyNoSelCopy"> - Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben. + Sie können Ihre Auswahl nicht kopieren, da Sie nicht über die Berechtigung zum Kopieren des Objekts <nolink>'[OBJ_NAME]'</nolink> verfügen. </notification> <notification name="NoTransNoSelCopy"> - Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist. + Sie können Ihre Auswahl nicht kopieren, da das Objekt <nolink>'[OBJ_NAME]'</nolink> nicht übertragbar ist. </notification> <notification name="NoTransNoCopy"> - Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist. + Sie können Ihre Auswahl nicht kopieren, da das Objekt <nolink>'[OBJ_NAME]'</nolink> nicht übertragbar ist. </notification> <notification name="NoPermsNoRemoval"> - Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet. + Entfernen des Objekts <nolink>'[OBJ_NAME]'</nolink> aus dem Simulator wird vom Berechtigungssystem nicht gestattet. </notification> <notification name="NoModNoSaveSelection"> - Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen. + Sie können Ihre Auswahl nicht speichern, da Sie nicht über die Berechtigung zum Modifizieren des Objekts <nolink>'[OBJ_NAME]'</nolink> verfügen. </notification> <notification name="NoCopyNoSaveSelection"> - Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann. + Ihre Auswahl kann nicht gespeichert werden, da das Objekt <nolink>'[OBJ_NAME]'</nolink> nicht kopiert werden kann. </notification> <notification name="NoModNoTaking"> - Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben. + Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht über die Berechtigung zum Modifizieren des Objekts <nolink>'[OBJ_NAME]'</nolink> verfügen. </notification> <notification name="RezDestInternalError"> Interner Fehler: Unbekannter Zielttyp. diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index 201998f220..c4705d7283 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -4,7 +4,6 @@ Sprache: </text> <combo_box name="language_combobox"> - <combo_box.item label="Systemvorgabe" name="System Default Language"/> <combo_box.item label="English (Englisch)" name="English"/> <combo_box.item label="Dansk (Dänisch) - Beta" name="Danish"/> <combo_box.item label="Deutsch - Beta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index cde04d8d69..78d445f362 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -5740,4 +5740,25 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Mav_Details_MAV_UNKNOWN_VERSION"> Die Physikform hat keine korrekte Version. Legen Sie die korrekte Version für das Physikmodell fest. </string> + <string name="couldnt_resolve_host"> + Der DNS konnte den Hostnamen ([HOSTNAME]) nicht auflösen Prüfen +Sie bitte, ob Sie die Website www.secondlife.com aufrufen können. Wenn Sie die +Website aufrufen können, jedoch weiterhin diese Fehlermeldung erhalten, +besuchen Sie bitte den Support-Bereich und melden Sie das Problem. + </string> + <string name="ssl_peer_certificate"> + Der Anmeldeserver konnte sich nicht per SSL verifizieren. +Wenn Sie diese Fehlermeldung weiterhin erhalten, besuchen +Sie bitte den Support-Bereich der Website Secondlife.com +und melden Sie das Problem. + </string> + <string name="ssl_connect_error"> + Die Ursache hierfür ist häufig eine falsch eingestellte Uhrzeit auf Ihrem Computer. +Bitte vergewissern Sie sich, dass Datum und Uhrzeit in der Systemsteuerung korrekt +eingestellt sind. Überprüfen Sie außerdem, ob Ihre Netzwerk- und Firewall-Einstellungen +korrekt sind. Wenn Sie diese Fehlermeldung weiterhin erhalten, besuchen Sie bitte den +Support-Bereich der Website Secondlife.com und melden Sie das Problem. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Knowledge-Base] + </string> </strings> diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index e7ab3cacdc..9fa93b640f 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -213,6 +213,7 @@ layout="topleft" top_pad="0" name="share_with_group" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." width="92" /> <text type="string" @@ -234,6 +235,7 @@ layout="topleft" top_pad="0" name="everyone_copy" + tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive" width="92" /> <text type="string" @@ -254,6 +256,7 @@ label="Modify" layout="topleft" name="next_owner_modify" + tool_tip="Next owner can edit properties like item name or scale of this object." top_pad="0" width="92" /> <check_box @@ -263,6 +266,7 @@ layout="topleft" top_pad="0" name="next_owner_copy" + tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied." width="92"> <check_box.commit_callback function="BulkPermission.CommitCopy"/> @@ -276,7 +280,7 @@ label="Transfer" layout="topleft" name="next_owner_transfer" - tool_tip="Next owner can give away or resell this object" + tool_tip="Next owner can give away or resell this object." width="92" /> <scroll_list enabled="false" diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 3db431de1b..5a86eb06fb 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -73,35 +73,6 @@ prevalidate_callback="ascii" top_pad="5" width="290" /> - <text - follows="left|top" - height="15" - layout="topleft" - left_pad="15" - name="model_category_label" - text_color="White" - top="0" - width="200"> - This model represents... - </text> - <combo_box - follows="left|top" - height="23" - left_pad="10" - name="model_category_combo" - top_pad="10" - width="200"> - <combo_box.drop_down_button - label_color="White"/> - <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/> - <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/> - <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/> - <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/> - <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/> - <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/> - <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/> - <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/> - </combo_box> </panel> <tab_container follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_my_scripts.xml b/indra/newview/skins/default/xui/en/floater_my_scripts.xml new file mode 100644 index 0000000000..3b0b6723c7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_my_scripts.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="570" + help_topic="scriptlimits" + layout="topleft" + name="myscripts" + save_rect="true" + title="My Scripts" + min_width="620" + width="620"> + <panel + filename="panel_script_limits_my_avatar.xml" + follows="all" + bottom="555" + layout="topleft" + left="3" + right="-2" + name="script_limits_my_avatar_panel" + top="20"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 845c1efe4d..0e62d50072 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -3,7 +3,7 @@ legacy_header_height="18" positioning="centered" default_tab_group="1" - height="512" + height="530" layout="topleft" name="Preferences" help_topic="preferences" @@ -25,7 +25,7 @@ https://accounts.secondlife.com/change_email/ layout="topleft" right="-105" name="OK" - top="473" + top="492" width="90"> <button.commit_callback function="Pref.OK" /> @@ -43,6 +43,42 @@ https://accounts.secondlife.com/change_email/ <button.commit_callback function="Pref.Cancel" /> </button> + + <panel + name="search_panel" + layout="topleft" + follows="left|top|right" + left="4" + right="-4" + top="21" + height="18" + tab_group="2"> + <search_editor + clear_button_visible="true" + follows="left|top|right" + height="18" + label="Search Settings" + layout="topleft" + left="0" + max_length_bytes="255" + name="search_prefs_edit" + right="-1" + text_pad_left="6" + tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment." + top="0"> + <search_editor.commit_callback + function="UpdateFilter" /> + <search_editor.clear_button + rect.height="18" + rect.width="18" + rect.bottom="-1" /> + <search_editor.search_button + rect.height="12" + rect.width="12" + rect.bottom="-1" /> + </search_editor> + </panel> + <tab_container follows="all" halign="left" @@ -54,7 +90,7 @@ https://accounts.secondlife.com/change_email/ tab_position="left" tab_width="140" tab_padding_right="0" - top="21" + top="40" width="658"> <panel class="panel_preference" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index d9a15fed9e..0abee2ff80 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -915,7 +915,8 @@ name="Object Name" select_on_focus="true" top_delta="0" - width="170" /> + width="170" + tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe '|'." /> <text follows="left|top" height="10" @@ -933,7 +934,8 @@ name="Object Description" select_on_focus="true" top_delta="0" - width="170" /> + width="170" + tool_tip="When people have 'Hover Tips on All Objects' selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." /> <text type="string" left="10" @@ -1090,7 +1092,8 @@ layout="topleft" name="clickaction" width="130" - left_pad="10"> + left_pad="10" + tool_tip="A click action enables you to interact with an object with a single left click. Each click action has a special cursor indicating what it does. Some click actions have requirements to function. For example Touch and Pay require scripts" > <combo_box.item label="Touch (default)" name="Touch/grab(default)" @@ -1126,7 +1129,8 @@ layout="topleft" name="checkbox for sale" left="7" - width="97" /> + width="97" + tool_tip="Lets people buy this object, its content or it copy inworld for specified price." /> <!-- NEW PRICE SPINNER Objects are allowed to be for sale for L$0 to invoke buy UI behavior even though the user gets a free copy. @@ -1144,7 +1148,8 @@ even though the user gets a free copy. width="85" min_val="0" height="20" - max_val="999999999" /> + max_val="999999999" + tool_tip="Object cost." /> <!-- NEW SALE TYPE COMBO BOX --> <combo_box left_pad="8" @@ -1157,7 +1162,8 @@ even though the user gets a free copy. max_chars="20" mouse_opaque="true" name="sale type" - width="89"> + width="89" + tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself." > <combo_box.item name="Copy" label="Copy" @@ -1219,6 +1225,7 @@ even though the user gets a free copy. label="Move" layout="topleft" name="checkbox allow everyone move" + tool_tip="Anyone can move the object." left="10" width="85" /> <check_box @@ -1227,6 +1234,7 @@ even though the user gets a free copy. layout="topleft" left_pad="0" name="checkbox allow everyone copy" + tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive." width="90" /> <text type="string" @@ -1244,6 +1252,7 @@ even though the user gets a free copy. left="10" height="10" name="checkbox next owner can modify" + tool_tip="Next owner can edit properties like item name or scale of this object." width="85" /> <check_box follows="left|top|right" @@ -1252,6 +1261,7 @@ even though the user gets a free copy. layout="topleft" left_pad="0" name="checkbox next owner can copy" + tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied." width="80" /> <check_box follows="left|top|right" @@ -1261,7 +1271,7 @@ even though the user gets a free copy. name="checkbox next owner can transfer" left_pad="0" top_delta="0" - tool_tip="Next owner can give away or resell this object" + tool_tip="Next owner can give away or resell this object." width="100" /> <!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, but that's OK, this is used only for debugging. --> diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 36ceddd305..b82fe43e74 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_resize="true" - height="372" + height="350" layout="topleft" min_height="300" min_width="450" @@ -16,7 +16,7 @@ </floater.string> <floater.string name="top_scripts_text"> - [COUNT] scripts taking a total of [TIME] ms + [COUNT] scripts taking a total of [TIME] ms and using [MEMORY] KB </floater.string> <floater.string name="scripts_score_label"> @@ -273,28 +273,4 @@ <button.commit_callback function="TopObjects.ReturnAll" /> </button> - <button - follows="bottom|left" - height="23" - label="Disable Selected" - layout="topleft" - - left="112" - name="disable_selected_btn" - width="130"> - <button.commit_callback - function="TopObjects.DisableSelected" /> - </button> - <button - follows="bottom|left" - height="23" - label="Disable All" - layout="topleft" - left_pad="10" - name="disable_all_btn" - top_delta="0" - width="130"> - <button.commit_callback - function="TopObjects.DisableAll" /> - </button> </floater> diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 82027d9e7c..8b1d50e58f 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -9,6 +9,7 @@ <file>gulim.ttc</file> <file>simhei.ttf</file> <file>ArialUni.ttf</file> + <file>msyh.ttc</file> </os> <os name="Mac"> <file>ヒラギノ角ゴシック W3.ttc</file> @@ -19,6 +20,7 @@ <file>AppleGothic.ttf</file> <file>AppleSDGothicNeo-Regular.otf</file> <file>华文细黑.ttf</file> + <file>PingFang.ttc</file> </os> </font> diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index 51779e4bfd..d418fc38e3 100644 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml @@ -42,6 +42,7 @@ <string name="TimeWeek">wkday,datetime,slt</string> <string name="TimeAMPM">ampm,datetime,slt</string> <string name="TimeHour12">hour12,datetime,slt</string> + <string name="TimeTimezone">timezone,datetime,slt</string> <string name="LTimeMthNum">mthnum,datetime,local</string> <string name="LTimeWeek">wkday,datetime,local</string> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 42744b561f..cac84cfccf 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -73,6 +73,13 @@ function="Floater.ToggleOrBringToFront" parameter="experiences"/> </menu_item_call> + <menu_item_call + label="My Scripts..." + name="MyScripts"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="my_scripts"/> + </menu_item_call> <menu_item_separator/> <menu_item_call label="Camera Controls..." diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d521074453..121914b1cb 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1845,7 +1845,7 @@ You are not allowed to terraform parcel [PARCEL]. name="CannotCopyWarning" type="alertmodal"> You do not have permission to copy the following items: -[ITEMS] +<nolink>[ITEMS]</nolink> and will lose it from your inventory if you give it away. Do you really want to offer these items? <tag>confirm</tag> <usetemplate @@ -7791,28 +7791,6 @@ Do not allow access if you do not fully understand why it wants access to your a </footer> </notification> - <notification - icon="notify.tga" - name="UnknownScriptQuestion" - persist="false" - type="notify"> -The runtime script permission requested by '<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', isn't recognized by the viewer and can't be granted. - -To grant this permission please update your viewer to the latest version from [DOWNLOADURL]. - <tag>confirm</tag> - <form name="form"> - <button - default="true" - index="1" - name="Deny" - text="Ok"/> - <button - index="2" - name="Mute" - text="Block"/> - </form> - </notification> - <notification icon="notify.tga" name="ScriptDialog" @@ -9504,7 +9482,7 @@ You Can't create trees and grass on land you don't own. name="NoCopyPermsNoObject" type="notify"> <tag>fail</tag> -Copy failed because you lack permission to copy the object '[OBJ_NAME]'. +Copy failed because you lack permission to copy the object <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification @@ -9512,7 +9490,7 @@ Copy failed because you lack permission to copy the object '[OBJ_NAME]'. name="NoTransPermsNoObject" type="notify"> <tag>fail</tag> -Copy failed because the object '[OBJ_NAME]' cannot be transferred to you. +Copy failed because the object <nolink>'[OBJ_NAME]'</nolink> cannot be transferred to you. </notification> <notification @@ -9520,7 +9498,7 @@ Copy failed because the object '[OBJ_NAME]' cannot be transferred to you. name="AddToNavMeshNoCopy" type="notify"> <tag>fail</tag> -Copy failed because the object '[OBJ_NAME]' contributes to navmesh. +Copy failed because the object <nolink>'[OBJ_NAME]'</nolink> contributes to navmesh. </notification> <notification @@ -9644,7 +9622,7 @@ Save Back To Inventory has been disabled. name="NoExistNoSaveToContents" type="notify"> <tag>fail</tag> -Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists. +Cannot save <nolink>'[OBJ_NAME]'</nolink> to object contents because the object it was rezzed from no longer exists. </notification> <notification @@ -9652,7 +9630,7 @@ Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed fro name="NoModNoSaveToContents" type="notify"> <tag>fail</tag> -Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'. +Cannot save <nolink>'[OBJ_NAME]'</nolink> to object contents because you do not have permission to modify the object <nolink>'[DEST_NAME]'</nolink>. </notification> <notification @@ -9660,7 +9638,7 @@ Cannot save '[OBJ_NAME]' to object contents because you do not have permission t name="NoSaveBackToInvDisabled" type="notify"> <tag>fail</tag> -Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled. +Cannot save <nolink>'[OBJ_NAME]'</nolink> back to inventory -- this operation has been disabled. </notification> <notification @@ -9668,7 +9646,7 @@ Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled. name="NoCopyNoSelCopy" type="notify"> <tag>fail</tag> -You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'. +You cannot copy your selection because you do not have permission to copy the object <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification @@ -9676,7 +9654,7 @@ You cannot copy your selection because you do not have permission to copy the ob name="NoTransNoSelCopy" type="notify"> <tag>fail</tag> -You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. +You cannot copy your selection because the object <nolink>'[OBJ_NAME]'</nolink> is not transferrable. </notification> <notification @@ -9684,7 +9662,7 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra name="NoTransNoCopy" type="notify"> <tag>fail</tag> -You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable. +You cannot copy your selection because the object <nolink>'[OBJ_NAME]'</nolink> is not transferrable. </notification> <notification @@ -9692,7 +9670,7 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra name="NoPermsNoRemoval" type="notify"> <tag>fail</tag> -Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system. +Removal of the object <nolink>'[OBJ_NAME]'</nolink> from the simulator is disallowed by the permissions system. </notification> <notification @@ -9700,7 +9678,7 @@ Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permi name="NoModNoSaveSelection" type="notify"> <tag>fail</tag> -Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'. +Cannot save your selection because you do not have permission to modify the object <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification @@ -9708,7 +9686,7 @@ Cannot save your selection because you do not have permission to modify the obje name="NoCopyNoSaveSelection" type="notify"> <tag>fail</tag> -Cannot save your selection because the object '[OBJ_NAME]' is not copyable. +Cannot save your selection because the object <nolink>'[OBJ_NAME]'</nolink> is not copyable. </notification> <notification @@ -9716,7 +9694,7 @@ Cannot save your selection because the object '[OBJ_NAME]' is not copyable. name="NoModNoTaking" type="notify"> <tag>fail</tag> -You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'. +You cannot take your selection because you do not have permission to modify the object <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification 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 9da044ab64..335d7caa51 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -32,11 +32,6 @@ width="200"> <combo_box.item enabled="true" - label="System default" - name="System Default Language" - value="default" /> - <combo_box.item - enabled="true" label="English" name="English" value="en" /> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 998f1ce599..52bcce01f7 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -34,6 +34,46 @@ L$ [AMT] </panel.string> <panel + height="18" + left="-458" + top="0" + width="120" + follows="right|top" + name="menu_search_panel" + background_opaque="true" + background_visible="true" + bg_opaque_color="MouseGray"> + <search_editor + clear_button_visible="true" + follows="left|top" + height="18" + label="Search Menus" + layout="topleft" + left="0" + max_length_bytes="255" + name="search_menu_edit" + right="-1" + text_pad_left="6" + tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu." + top="0"> + <search_button + top_pad="4" + left_pad="4" + width="12" + height="12" + image_unselected="Search" + image_selected="Search"/> + <clear_button + bottom="2" + height="12" + image_unselected="Icon_Close_Foreground" + image_selected="Icon_Close_Press" + pad_right="4" + pad_left="4" + width="12"/> + </search_editor> + </panel> + <panel height="18" left="-416" width="185" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index fd14b13ed6..acb6f5b42a 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -130,7 +130,8 @@ max_length_bytes="63" name="LabelItemName" top_delta="0" - width="210" /> + width="210" + tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe '|'." /> <text type="string" length="1" @@ -153,7 +154,8 @@ max_length_bytes="127" name="LabelItemDesc" top_delta="-5" - width="210" /> + width="210" + tool_tip="When people have 'Hover Tips on All Objects' selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." /> <text type="string" length="1" @@ -351,6 +353,7 @@ layout="topleft" left_pad="0" name="CheckEveryoneCopy" + tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive." top_delta="-2" width="150" /> <text @@ -394,6 +397,7 @@ left="20" top_pad="0" name="CheckNextOwnerModify" + tool_tip="Next owner can edit properties like item name or scale of this object." width="90" /> <check_box height="18" @@ -401,6 +405,7 @@ layout="topleft" left_pad="0" name="CheckNextOwnerCopy" + tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied." width="90" /> <check_box height="18" @@ -408,7 +413,7 @@ layout="topleft" left_pad="0" name="CheckNextOwnerTransfer" - tool_tip="Next owner can give away or resell this object" + tool_tip="Next owner can give away or resell this object." width="106" /> </panel> <check_box @@ -418,14 +423,16 @@ left="20" name="CheckPurchase" top_pad="20" - width="100" /> + width="100" + tool_tip="Lets people buy this object, its content or it copy inworld for specified price." /> <combo_box height="23" left_pad="0" layout="topleft" follows="left|top" name="ComboBoxSaleType" - width="170"> + width="170" + tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself." > <combo_box.item name="Copy" label="Copy" @@ -452,7 +459,8 @@ min_val="0" height="23" max_val="999999999" - top_pad="10"/> + top_pad="10" + tool_tip="Object cost." /> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index efedb9559e..8a3e18707f 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -130,7 +130,8 @@ max_length_bytes="63" name="Object Name" top_delta="0" - width="225" /> + width="225" + tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe '|'." /> <text type="string" length="1" @@ -154,7 +155,8 @@ left_delta="78" max_length_bytes="127" top_delta="-5" - width="225"/> + width="225" + tool_tip="When people have 'Hover Tips on All Objects' selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." /> <text type="string" length="1" @@ -271,23 +273,24 @@ layout="topleft" name="clickaction" width="168" - left="81"> + left="81" + tool_tip="A click action enables you to interact with an object with a single left click. Each click action has a special cursor indicating what it does. Some click actions have requirements to function. For example Touch and Pay require scripts" > <combo_box.item label="Touch (default)" name="Touch/grab(default)" - value="Touch" /> + value="Touch" /> <combo_box.item label="Sit on object" name="Sitonobject" - value="Sit" /> + value="Sit" /> <combo_box.item label="Buy object" name="Buyobject" - value="Buy" /> + value="Buy" /> <combo_box.item label="Pay object" name="Payobject" - value="Pay" /> + value="Pay" /> <combo_box.item label="Open" name="Open" @@ -344,6 +347,7 @@ layout="topleft" left_pad="0" name="checkbox allow everyone copy" + tool_tip="Anyone can take a copy of the object. Object and all of its contents must be copy and transfer permissive." top_delta="-2" width="90" /> <check_box @@ -351,6 +355,7 @@ label="Move" layout="topleft" name="checkbox allow everyone move" + tool_tip="Anyone can move the object." left_pad="0" width="150" /> <text @@ -394,6 +399,7 @@ left="20" top_pad="0" name="checkbox next owner can modify" + tool_tip="Next owner can edit properties like item name or scale of this object." width="90" /> <check_box height="18" @@ -401,6 +407,7 @@ layout="topleft" left_pad="0" name="checkbox next owner can copy" + tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied." width="90" /> <check_box height="18" @@ -418,14 +425,16 @@ left="20" name="checkbox for sale" top_pad="10" - width="100" /> + width="100" + tool_tip="Lets people buy this object, its content or it copy inworld for specified price." /> <combo_box height="23" left_pad="0" layout="topleft" follows="left|top" - name="sale type" - width="170"> + name="sale type" + width="170" + tool_tip="Select whether purchaser will receive a copy, copy of the content or item itself."> <combo_box.item name="Copy" label="Copy" @@ -452,7 +461,8 @@ width="150" min_val="1" height="20" - max_val="999999999" /> + max_val="999999999" + tool_tip="Object cost." /> <check_box height="20" width="110" @@ -569,7 +579,8 @@ left="5" name="open_btn" top="0" - width="73" /> + width="73" + tool_tip="Open to view the Object Contents." /> <button follows="bottom|left" height="23" @@ -578,7 +589,8 @@ left_pad="5" name="pay_btn" top="0" - width="73" /> + width="73" + tool_tip="Open Pay Window. Object must have pay script for this to work." /> <button follows="bottom|left" height="23" @@ -587,7 +599,8 @@ left_pad="5" name="buy_btn" top="0" - width="73" /> + width="73" + tool_tip="Open Buy Window. Requires the object to be set for sale." /> <button follows="bottom|left" height="23" @@ -596,7 +609,8 @@ left_pad="5" name="details_btn" top="0" - width="74" /> + width="74" + tool_tip="Open Inspect Object Window." /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f5f4b4acab..d91f3ac095 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2675,14 +2675,14 @@ If you continue to receive this message, please contact Second Life support for <string name="SITTING_ON">Sitting On</string> <string name="ATTACH_CHEST">Chest</string> - <string name="ATTACH_HEAD">Head</string> + <string name="ATTACH_HEAD">Skull</string> <string name="ATTACH_LSHOULDER">Left Shoulder</string> <string name="ATTACH_RSHOULDER">Right Shoulder</string> <string name="ATTACH_LHAND">Left Hand</string> <string name="ATTACH_RHAND">Right Hand</string> <string name="ATTACH_LFOOT">Left Foot</string> <string name="ATTACH_RFOOT">Right Foot</string> - <string name="ATTACH_BACK">Back</string> + <string name="ATTACH_BACK">Spine</string> <string name="ATTACH_PELVIS">Pelvis</string> <string name="ATTACH_MOUTH">Mouth</string> <string name="ATTACH_CHIN">Chin</string> @@ -2692,16 +2692,16 @@ If you continue to receive this message, please contact Second Life support for <string name="ATTACH_REYE">Right Eye</string> <string name="ATTACH_NOSE">Nose</string> <string name="ATTACH_RUARM">Right Upper Arm</string> - <string name="ATTACH_RLARM">Right Lower Arm</string> + <string name="ATTACH_RLARM">Right Forearm</string> <string name="ATTACH_LUARM">Left Upper Arm</string> - <string name="ATTACH_LLARM">Left Lower Arm</string> + <string name="ATTACH_LLARM">Left Forearm</string> <string name="ATTACH_RHIP">Right Hip</string> <string name="ATTACH_RULEG">Right Upper Leg</string> <string name="ATTACH_RLLEG">Right Lower Leg</string> <string name="ATTACH_LHIP">Left Hip</string> <string name="ATTACH_LULEG">Left Upper Leg</string> <string name="ATTACH_LLLEG">Left Lower Leg</string> - <string name="ATTACH_BELLY">Belly</string> + <string name="ATTACH_BELLY">Stomach</string> <string name="ATTACH_LEFT_PEC">Left Pec</string> <string name="ATTACH_RIGHT_PEC">Right Pec</string> <string name="ATTACH_HUD_CENTER_2">HUD Center 2</string> @@ -4233,4 +4233,29 @@ Try enclosing path to the editor with double quotes. The physics shape does not have correct version. Set the correct version for the physics model. </string> + <!-- CURL error messages --> + <string name="couldnt_resolve_host"> +DNS could not resolve the host name([HOSTNAME]). +Please verify that you can connect to the www.secondlife.com +web site. If you can, but continue to receive this error, +please go to the support section and report this problem. + </string> + <string name="ssl_peer_certificate"> +The login server couldn't verify itself via SSL. +If you continue to receive this error, please go +to the Support section of the SecondLife.com web site +and report the problem. + </string> + <string name="ssl_connect_error"> +Often this means that your computer's clock is set incorrectly. +Please go to Control Panels and make sure the time and date +are set correctly. +Also check that your network and firewall are set up correctly. +If you continue to receive this error, please go +to the Support section of the SecondLife.com web site +and report the problem. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Knowledge Base] + </string> + </strings> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 18703761ec..92c3864f62 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -243,6 +243,10 @@ La inicialización del mercado ha fallado por un error del sistema o de la red. Nota: Al activar esta opción, cualquiera que utilice este ordenador podrá ver tu lista de lugares favoritos. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + No es posible ejecutar varios visores Second Life ya que esta funcionalidad no es compatible. Puede provocar problemas de caché en la textura, imágenes degradadas o alteradas y un bajo rendimiento. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso. ¿Quieres conceder permisos de modificación a [NAME]? @@ -713,8 +717,9 @@ La calidad gráfica puede ajustarse en Preferencias > Gráficos. No tienes permiso para modificar el terreno de la parcela [PARCEL]. </notification> <notification name="CannotCopyWarning"> - No tienes permiso para copiar los elementos siguientes: -[ITEMS] y, si los das, los perderás del inventario. ¿Seguro que quieres ofrecerlos? + No tienes permiso para copiar los elementos siguientes: +<nolink>[ITEMS]</nolink> +y, si los das, los perderás del inventario. ¿Seguro que quieres ofrecerlos? <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> <notification name="CannotGiveItem"> @@ -3708,13 +3713,13 @@ no está en la misma región que tú. No puedes crear árboles y hierba en un terreno que no es tuyo. </notification> <notification name="NoCopyPermsNoObject"> - Error al copiar: careces de permiso para copiar el objeto '[OBJ_NAME]'. + Error al copiar porque no tienes permiso para copiar el objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransPermsNoObject"> - Error al copiar: no se te puede transferir el objeto '[OBJ_NAME]'. + Error al copiar porque no puedes recibir una transferencia del objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="AddToNavMeshNoCopy"> - Error al copiar porque el objeto '[OBJ_NAME]' contribuye al navmesh. + Error al copiar porque el objeto <nolink>'[OBJ_NAME]'</nolink> contribuye a navmesh. </notification> <notification name="DupeWithNoRootsSelected"> Duplicación sin objetos raíz seleccionados. @@ -3759,34 +3764,34 @@ Prueba otra vez dentro de un minuto. Se ha deshabilitado Devolver el objeto a mi inventario. </notification> <notification name="NoExistNoSaveToContents"> - No se puede guardar '[OBJ_NAME]' en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe. + No se puede guardar <nolink>'[OBJ_NAME]'</nolink> en los contenidos del objeto porque el objeto a partir del cual fue creado ya no existe. </notification> <notification name="NoModNoSaveToContents"> - No se puede guardar '[OBJ_NAME]' en el contenido del objeto porque no tienes permiso para modificar el objeto '[DEST_NAME]'. + No se puede guardar <nolink>'[OBJ_NAME]'</nolink> en los contenidos del objeto porque no tienes permiso para modificar el objeto <nolink>'[DEST_NAME]'</nolink>. </notification> <notification name="NoSaveBackToInvDisabled"> - No se puede guardar '[OBJ_NAME]' de nuevo en el inventario; esta operación está desactivada. + No se puede volver a guardar <nolink>'[OBJ_NAME]'</nolink> en el inventario. Esta operación fue desactivada. </notification> <notification name="NoCopyNoSelCopy"> - No se puede copiar tu selección porque no tienes permiso para copiar el objeto '[OBJ_NAME]'. + No puedes copiar el elemento seleccionado porque no tienes permiso para copiar el objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransNoSelCopy"> - No se puede copiar tu selección porque el objeto '[OBJ_NAME]' es intransferible. + No puedes copiar el elemento seleccionado porque el objeto <nolink>'[OBJ_NAME]'</nolink> no es transferible. </notification> <notification name="NoTransNoCopy"> - No se puede copiar tu selección porque el objeto '[OBJ_NAME]' es intransferible. + No puedes copiar el elemento seleccionado porque el objeto <nolink>'[OBJ_NAME]'</nolink> no es transferible. </notification> <notification name="NoPermsNoRemoval"> - El sistema de permisos no admite la eliminación del objeto '[OBJ_NAME]' del simulador. + El sistema de permisos no autoriza quitar el objeto <nolink>'[OBJ_NAME]'</nolink> del simulador. </notification> <notification name="NoModNoSaveSelection"> - No se puede guardar tu selección porque no tienes permiso para modificar el objeto '[OBJ_NAME]'. + No puedes guardar el elemento seleccionado porque no tienes permiso para modificar el objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoCopyNoSaveSelection"> - No se puede guardar tu selección porque el objeto '[OBJ_NAME]' no se puede copiar. + No puedes guardar el elemento seleccionado porque el objeto <nolink>'[OBJ_NAME]'</nolink> no puede ser copiado. </notification> <notification name="NoModNoTaking"> - No se puede aceptar tu selección porque no tienes permiso para modificar el objeto '[OBJ_NAME]'. + No puedes tomar el elemento seleccionado porque no tienes permiso para modificar el objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="RezDestInternalError"> Error interno: tipo de destino desconocido. diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index 7d3c33a781..d2246630d8 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -4,7 +4,6 @@ Idioma: </text> <combo_box name="language_combobox"> - <combo_box.item label="Predeterminado del sistema" name="System Default Language"/> <combo_box.item label="English (Inglés)" name="English"/> <combo_box.item label="Dansk (danés) - Beta" name="Danish"/> <combo_box.item label="Deutsch (Alemán) - Beta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 36a2711a5c..15e3c0622d 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -5651,4 +5651,25 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Mav_Details_MAV_UNKNOWN_VERSION"> La versión de la forma física no es correcta. Configura la versión correcta del modelo físico. </string> + <string name="couldnt_resolve_host"> + Error de DNS al resolver el nombre del host([HOSTNAME]). +Por favor verifica si puedes conectarte al sitio web www.secondlife.com. +Si puedes conectarte, pero aún recibes este error, por favor accede a +la sección Soporte y genera un informe del problema. + </string> + <string name="ssl_peer_certificate"> + El servidor de inicio de sesión no pudo verificarse vía SSL. +Si aún recibes este error, por favor accede a +la sección Soporte del sitio web Secondlife.com +y genera un informe del problema. + </string> + <string name="ssl_connect_error"> + En general esto significa que el horario de tu computadora no está bien configurado. +Por favor accede al Panel de control y asegúrate de que la hora y la fecha estén +bien configurados. Verifica también que tu red y tu cortafuegos estén bien +configurados. Si aún recibes este error, por favor accede a la sección Soporte +del sitio web Secondlife.com y genera un informe del problema. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Base de conocimientos] + </string> </strings> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 62237221dd..0ac5f78921 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -244,6 +244,10 @@ Veuillez ne sélectionner qu'un seul objet. Remarque : si vous activez cette option, toutes les personnes utilisant cet ordinateur pourront voir votre liste d'endroits favoris. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + L'exécution de plusieurs visualiseurs Second Life n'est pas prise en charge. Cela peut entraîner des collisions de cache de texture, une corruption et une dégradation des visuels et des performances. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Lorsque vous accordez des droits de modification à un autre résident, vous lui permettez de changer, supprimer ou prendre n'importe lequel de vos objets dans Second Life. Réfléchissez bien avant d'accorder ces droits. Voulez-vous vraiment accorder des droits de modification à [NAME] ? @@ -717,9 +721,9 @@ La qualité des graphiques peut être augmentée à la section Préférences > Vous n'êtes pas autorisé(e) à terraformer la parcelle [PARCEL]. </notification> <notification name="CannotCopyWarning"> - Vous n'êtes pas autorisé à copier les articles suivants : -[ITEMS]. -Ceux-ci disparaîtront donc de votre inventaire si vous les donnez. Voulez-vous vraiment offrir ces articles ? + Vous n'êtes pas autorisé à copier les objets suivants : +<nolink>[ITEMS]</nolink> +et il disparaîtra de votre inventaire si vous le donnez. Voulez-vous vraiment offrir ces articles ? <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> </notification> <notification name="CannotGiveItem"> @@ -3711,13 +3715,13 @@ il ne se trouve pas dans la même région que vous. Vous ne pouvez pas créer d'arbres ni d'herbe sur un terrain qui ne vous appartient pas. </notification> <notification name="NoCopyPermsNoObject"> - Échec de la copie car vous ne disposez pas des droits requis pour copier l'objet [OBJ_NAME]. + La copie a échoué car vous ne disposez pas de l'autorisation nécessaire pour copier l'objet <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransPermsNoObject"> - Échec de la copie car l'objet [OBJ_NAME] ne peut pas vous être transféré. + La copie a échoué car l'objet <nolink>'[OBJ_NAME]'</nolink> ne peut pas vous être transféré. </notification> <notification name="AddToNavMeshNoCopy"> - Échec de la copie car l'objet [OBJ_NAME] contribue au maillage de navigation. + La copie a échoué car l'objet <nolink>'[OBJ_NAME]'</nolink> contribue à navmesh. </notification> <notification name="DupeWithNoRootsSelected"> Dupliquer sans objet racine sélectionné @@ -3762,34 +3766,34 @@ Veuillez réessayer dans une minute. Le réenregistrement dans l'inventaire a été désactivé. </notification> <notification name="NoExistNoSaveToContents"> - Impossible d'enregistrer [OBJ_NAME] dans le contenu des objets car l'objet à partir duquel il a été rezzé n'existe plus. + Impossible de sauvegarder <nolink>'[OBJ_NAME]'</nolink> dans le contenu de l'objet car l'objet à partir duquel il a été rezzé n'existe plus. </notification> <notification name="NoModNoSaveToContents"> - Impossible d'enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l'objet [DEST_NAME]. + Impossible de sauvegarder<nolink>'[OBJ_NAME]'</nolink> dans le contenu de l'objet car vous n'êtes pas autorisé à modifier l'objet <nolink>'[DEST_NAME]'</nolink>. </notification> <notification name="NoSaveBackToInvDisabled"> - Impossible de réenregistrer [OBJ_NAME] dans l'inventaire -- cette opération a été désactivée. + Impossible de sauvegarder <nolink>'[OBJ_NAME]'</nolink> dans l'inventaire - cette opération a été désactivée. </notification> <notification name="NoCopyNoSelCopy"> - Vous ne pouvez pas copier votre sélection car vous n'avez pas le droit de copier l'objet [OBJ_NAME]. + Vous ne pouvez pas copier votre sélection parce que vous n'êtes pas autorisé à copier l'objet <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransNoSelCopy"> - Vous ne pouvez pas copier votre sélection car l'objet [OBJ_NAME] n'est pas transférable. + Vous ne pouvez pas copier votre sélection parce que l'objet <nolink>'[OBJ_NAME]'</nolink> n'est pas transférable. </notification> <notification name="NoTransNoCopy"> - Vous ne pouvez pas copier votre sélection car l'objet [OBJ_NAME] n'est pas transférable. + Vous ne pouvez pas copier votre sélection parce que l'objet <nolink>'[OBJ_NAME]'</nolink> n'est pas transférable. </notification> <notification name="NoPermsNoRemoval"> - La suppression de l'objet [OBJ_NAME] du simulateur n'est pas autorisée par le système de droits. + La suppression de l'objet <nolink>'[OBJ_NAME]'</nolink> du simulateur n'est pas autorisée par le système d'autorisations. </notification> <notification name="NoModNoSaveSelection"> - Vous ne pouvez pas enregistrer votre sélection car vous n'avez pas le droit de modifier l'objet [OBJ_NAME]. + Impossible de sauvegarder votre sélection parce que vous n'êtes pas autorisé à modifier l'objet <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoCopyNoSaveSelection"> - Vous ne pouvez pas enregistrer votre sélection car l'objet [OBJ_NAME] ne peut pas être copié. + Impossible d'enregistrer votre sélection car l'objet <nolink>'[OBJ_NAME]'</nolink> n'est pas copiable. </notification> <notification name="NoModNoTaking"> - Vous ne pouvez pas prendre votre sélection car vous n'avez pas le droit de modifier l'objet [OBJ_NAME]. + Vous ne pouvez pas sauvegarder votre sélection parce que vous n'êtes pas autorisé à modifier l'objet <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="RezDestInternalError"> Erreur interne : type de destination inconnue. diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 11b1bd9b87..b75567a40f 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -4,7 +4,6 @@ Langue : </text> <combo_box name="language_combobox"> - <combo_box.item label="Choix par défaut" name="System Default Language"/> <combo_box.item label="English (Anglais)" name="English"/> <combo_box.item label="Dansk (Danois) - Bêta" name="Danish"/> <combo_box.item label="Deutsch (Allemand) - Bêta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 7f5851b51d..13dd2b3640 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -5741,4 +5741,25 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Mav_Details_MAV_UNKNOWN_VERSION"> La forme physique n’a pas la version correcte. Configurez la version correcte pour le modèle physique. </string> + <string name="couldnt_resolve_host"> + DNS n'a pas pu résoudre le nom d'hôte([HOSTNAME]). +Veuillez vérifier que vous parvenez à vous connecter au site www.secondlife.com. +Si c'est le cas, et que vous continuez à recevoir ce message d'erreur, veuillez vous +rendre à la section Support et signaler ce problème + </string> + <string name="ssl_peer_certificate"> + Le serveur d'identification a rencontré une erreur de connexion SSL. +Si vous continuez à recevoir ce message d'erreur, +veuillez vous rendre à la section Support du site web +SecondLife.com et signaler ce problème + </string> + <string name="ssl_connect_error"> + Ceci est souvent dû à un mauvais réglage de l'horloge de votre ordinateur. +Veuillez aller à Tableaux de bord et assurez-vous que l'heure et la date sont réglés +correctement. Vérifiez également que votre réseau et votre pare-feu sont configurés +correctement. Si vous continuez à recevoir ce message d'erreur, veuillez vous rendre +à la section Support du site web SecondLife.com et signaler ce problème. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Base de connaissances] + </string> </strings> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 0abcde80e0..0175275eb3 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -244,6 +244,10 @@ Scegli solo un oggetto e riprova. Nota: Se attivi questa opzione, chiunque usa questo computer può vedere l'elenco di luoghi preferiti. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + Non è possibile utilizzare più di un viewer Second Life contemporaneamente. L’utilizzo simultaneo potrebbe portare a collisioni o corruzione della cache texture, e ad un peggioramento nelle immagini e nella performance. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Quando concedi i diritti di modifica ad un altro residente, gli permetti di modificare, eliminare o prendere QUALSIASI oggetto che possiedi in Second Life. Pertanto ti consigliamo di essere ben sicuro quando concedi questo diritto. Vuoi concedere i diritti di modifica a [NAME]? @@ -716,8 +720,8 @@ La qualità grafica può essere aumentata in Preferenze > Grafica. </notification> <notification name="CannotCopyWarning"> Non hai l'autorizzazione a copiare i seguenti oggetti: -[ITEMS] -e se li dai via, verranno eliminati dal tuo inventario. Sicuro di volere offrire questi oggetti? +<nolink>[ITEMS]</nolink> +e se li dai via, verranno eliminati dal tuo inventario. Sicuro di voler offrire questi oggetti? <usetemplate name="okcancelbuttons" notext="No" yestext="Si"/> </notification> <notification name="CannotGiveItem"> @@ -3715,13 +3719,13 @@ non è nella stessa regione in cui ti trovi. Non puoi creare alberi ed erba su terreni che non sono di tua proprietà. </notification> <notification name="NoCopyPermsNoObject"> - Copia non riuscita perché non hai l'autorizzazione necessaria per copiare l'oggetto '[OBJ_NAME]'. + Copia non riuscita perché non hai il permesso per copiare l’oggetto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransPermsNoObject"> - La copia non è riuscita perché '[OBJ_NAME]' non può essere trasferito a te. + Copia non riuscita perché l’oggetto <nolink>'[OBJ_NAME]'</nolink> non può esserti trasferito. </notification> <notification name="AddToNavMeshNoCopy"> - La copia non è riuscita perché '[OBJ_NAME]' contribuisce al navmesh. + Copia non riuscita perché l’oggetto <nolink>'[OBJ_NAME]'</nolink> contribuisce al navmesh. </notification> <notification name="DupeWithNoRootsSelected"> Duplicato senza oggetto principale selezionato. @@ -3766,34 +3770,34 @@ Riprova tra un minuto. Opzione Salva nell'inventario disattivata </notification> <notification name="NoExistNoSaveToContents"> - Impossibile salvare '[OBJ_NAME]' nei contenuti dell'oggetto perché l'oggetto da cui è stato razzato non esiste più. + Impossibile salvare <nolink>'[OBJ_NAME]'</nolink> in contenuti oggetto perché l’oggetto da cui è stato rezzato non esiste più. </notification> <notification name="NoModNoSaveToContents"> - Impossibile salvare '[OBJ_NAME]' nei contenuti dell'oggetto perché non hai l'autorizzazione necessaria per modificare l'oggetto '[DEST_NAME]'. + Impossibile salvare <nolink>'[OBJ_NAME]'</nolink> in contenuti oggetto perché non hai i permessi per modificare l’oggetto <nolink>'[DEST_NAME]’</nolink>. </notification> <notification name="NoSaveBackToInvDisabled"> - Impossibile riportare '[OBJ_NAME]' nell'inventario -- questa operazione è stata disattivata. + Impossibile salvare <nolink>'[OBJ_NAME]'</nolink> nell’inventario: questa operazione è stata disabilitata. </notification> <notification name="NoCopyNoSelCopy"> - Non puoi copiare l'elemento selezionato perché non hai l'autorizzazione necessaria per copiare l'oggetto '[OBJ_NAME]'. + Non puoi copiare la selezione perché non hai il permesso di copiare l’oggetto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransNoSelCopy"> - Non puoi copiare la selezione perché l'oggetto '[OBJ_NAME]' non può essere trasferito. + Non puoi copiare la selezione perché l’oggetto <nolink>'[OBJ_NAME]'</nolink> non è trasferibile. </notification> <notification name="NoTransNoCopy"> - Non puoi copiare la selezione perché l'oggetto '[OBJ_NAME]' non può essere trasferito. + Non puoi copiare la selezione perché l’oggetto <nolink>'[OBJ_NAME]'</nolink> non è trasferibile. </notification> <notification name="NoPermsNoRemoval"> - La rimozione dell'oggetto '[OBJ_NAME]' dal simulatore non è consentita dal sistema delle autorizzazioni. + La rimozione dell’oggetto <nolink>'[OBJ_NAME]'</nolink> dal simulatore è disattivata dal sistema dei permessi. </notification> <notification name="NoModNoSaveSelection"> - Non puoi salvare l'elemento selezionato perché non hai l'autorizzazione necessaria per modificare l'oggetto '[OBJ_NAME]'. + Non puoi copiare la selezione perché non hai il permesso di modificare l’oggetto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoCopyNoSaveSelection"> - Non puoi salvare la selezione perché l'oggetto '[OBJ_NAME]' non può essere copiato. + Non puoi copiare la selezione perché l’oggetto <nolink>'[OBJ_NAME]'</nolink> non è copiabile. </notification> <notification name="NoModNoTaking"> - Non puoi prendere l'elemento selezionato perché non hai l'autorizzazione necessaria per modificare l'oggetto '[OBJ_NAME]'. + Non puoi prendere ciò che hai selezionato perché non hai il permesso di modificare l’oggetto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="RezDestInternalError"> Errore interno: Tipo di destinazione sconosciuto. diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index ef999d03c0..49edc0aa12 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -4,7 +4,6 @@ Lingua: </text> <combo_box name="language_combobox"> - <combo_box.item label="Default di sistema" name="System Default Language"/> <combo_box.item label="English" name="English"/> <combo_box.item label="Dansk (Danese) - Beta" name="Danish"/> <combo_box.item label="Deutsch (Tedesco) - Beta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 918e655ab6..be3acc14b3 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -5656,4 +5656,25 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Mav_Details_MAV_UNKNOWN_VERSION"> La versione della forma fisica non è corretta. Imposta la versione corretta per il modello della fisica. </string> + <string name="couldnt_resolve_host"> + Il DNS non ha potuto risolvere il nome dell’host([HOSTNAME]). +Verifica di riuscire a connetterti al sito web www.secondlife.com. +Se riesci ma continui a ricevere questo errore, visita la sezione +Assistenza e segnala il problema. + </string> + <string name="ssl_peer_certificate"> + Il server per il login non ha potuto effettuare la verifica tramite SSL. +Se continui a ricevere questo errore, visita +la sezione Assistenza nel sito SecondLife.com +e segnala il problema. + </string> + <string name="ssl_connect_error"> + Spesso l’errore è dovuto all’orologio del computer, impostato incorrettamente. +Vai al Pannello di Controllo e assicurati che data e ora siano +esatte. Controlla anche che il network e il firewall siano impostati +correttamente. Se continui a ricevere questo errore, visita la sezione +Assistenza nel sito SecondLife.com e segnala il problema. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Base conoscenze] + </string> </strings> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index abd9515e34..315e35bc41 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -244,6 +244,10 @@ 注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。 <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + 複数の Second Life ビューワを実行することはサポートされていません。テクスチャキャッシュのコリジョンや破損、およびビジュアルとパフォーマンスの低下につながる恐れがあります。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> 他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。 [NAME] に修正権限を与えますか？ @@ -735,7 +739,9 @@ L$ が不足しているのでこのグループに参加することができ あなたには [PARCEL] 区画を地形編集する許可がありません。 </notification> <notification name="CannotCopyWarning"> - あなたには[ITEMS]というアイテムをコピーする許可がありません。他の住人に提供すると、そのアイテムはあなたのインベントリから削除されます。本当にこれらのアイテムを譲りますか？ + あなたには次アイテムをコピーする権限がありません： +<nolink>[ITEMS]</nolink> +他の住人に譲ると、そのアイテムはあなたの持ち物から削除されます。本当にこれらのアイテムを譲りますか？ <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> <notification name="CannotGiveItem"> @@ -3752,13 +3758,13 @@ M キーを押して変更します。 所有していない土地に木や草を植えることはできません。 </notification> <notification name="NoCopyPermsNoObject"> - オブジェクト '[OBJ_NAME]' をコピーする権限がないため、コピーに失敗しました。 + あなたにはオブジェクト <nolink>'[OBJ_NAME]'</nolink> をコピーする権限がないため、コピーに失敗しました。 </notification> <notification name="NoTransPermsNoObject"> - オブジェクト '[OBJ_NAME]' をあなたに転送できないため、コピーに失敗しました。 + オブジェクト <nolink>'[OBJ_NAME]'</nolink> はあなたに譲渡できないため、コピーに失敗しました。 </notification> <notification name="AddToNavMeshNoCopy"> - オブジェクト '[OBJ_NAME]' がナビメッシュに貢献しているため、コピーに失敗しました。 + オブジェクト <nolink>'[OBJ_NAME]'</nolink> は navmesh に関連があるため、コピーに失敗しました。 </notification> <notification name="DupeWithNoRootsSelected"> ルートオブジェクトを選択せずに複製します。 @@ -3803,34 +3809,34 @@ M キーを押して変更します。 「「持ち物」に保存」が無効になっています。 </notification> <notification name="NoExistNoSaveToContents"> - '[OBJ_NAME]' の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。 + 「存在しません」から rez されたため、<nolink>'[OBJ_NAME]'</nolink> をオブジェクトの中身に保存できませんでした。 </notification> <notification name="NoModNoSaveToContents"> - オブジェクト '[DEST_NAME]' を修正する権限がないため、オブジェクトのコンテンツに '[OBJ_NAME]' を保存できません。 + あなたにはオブジェクト <nolink>'[DEST_NAME]'</nolink> を修正する権限がないため、<nolink>'[OBJ_NAME]'</nolink>をオブジェクトの中身に保存できませんでした。 </notification> <notification name="NoSaveBackToInvDisabled"> - インベントリに '[OBJ_NAME]' を保存することはできません - この操作が無効になっています。 + <nolink>'[OBJ_NAME]'</nolink> をインベントリに保存できません。この操作は無効になりました。 </notification> <notification name="NoCopyNoSelCopy"> - オブジェクト '[OBJ_NAME]' を変更する権限を持っていないため、選択したものをコピーできません。 + あなたにはオブジェクト <nolink>'[OBJ_NAME]'</nolink> をコピーする権限がないため、選択内容をコピーできません。 </notification> <notification name="NoTransNoSelCopy"> - オブジェクト '[OBJ_NAME]' を転送できないため、選択したものをコピーできません。 + オブジェクト <nolink>'[OBJ_NAME]'</nolink> を譲渡できないため、選択内容をコピーできません。 </notification> <notification name="NoTransNoCopy"> - オブジェクト '[OBJ_NAME]' を転送できないため、選択したものをコピーできません。 + オブジェクト <nolink>'[OBJ_NAME]'</nolink> を譲渡できないため、選択内容をコピーできません。 </notification> <notification name="NoPermsNoRemoval"> - シミュレータからのオブジェクト '[OBJ_NAME]' の削除は、権限システムによって無効にされています。 + オブジェクト <nolink>'[OBJ_NAME]'</nolink> をシミュレーターから削除することは、権限のシステムにより許可されていません。 </notification> <notification name="NoModNoSaveSelection"> - オブジェクト '[OBJ_NAME]' を変更する権限を持っていないため、選択したものを保存できません。 + あなたにはオブジェクト <nolink>'[OBJ_NAME]'</nolink> を修正する権限がないため、選択内容を保存できません。 </notification> <notification name="NoCopyNoSaveSelection"> - オブジェクト '[OBJ_NAME]' をコピーできないため、選択したものを保存できません。 + オブジェクト <nolink>'[OBJ_NAME]'</nolink> はコピー不可なため、選択内容を保存できません。 </notification> <notification name="NoModNoTaking"> - オブジェクト '[OBJ_NAME]' を変更する権限を持っていないため、選択したものを取得できません。 + あなたにはオブジェクト <nolink>'[OBJ_NAME]'</nolink> を修正する権限がないため、選択内容を選ぶことはできません。 </notification> <notification name="RezDestInternalError"> 内部エラー: 不明な宛先タイプ。 diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index e2b74354fa..378cf8652e 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -4,7 +4,6 @@ 言語： </text> <combo_box name="language_combobox"> - <combo_box.item label="システムデフォルト" name="System Default Language"/> <combo_box.item label="English （英語）" name="English"/> <combo_box.item label="Dansk (デンマーク語) - ベータ" name="Danish"/> <combo_box.item label="Deutsch （ドイツ語） – ベータ" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml index ebaab7c122..04dfc0176d 100644 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_snapshot_options"> <button label="ディスクに保存" name="save_to_computer_btn"/> - <button label="持ち物に保存（L$[Amount]）" name="save_to_inventory_btn"/> + <button label="持ち物に保存（L$[AMOUNT]）" name="save_to_inventory_btn"/> <button label="プロフィールフィードで共有する" name="save_to_profile_btn"/> <button label="Facebook で共有する" name="send_to_facebook_btn"/> <button label="Twitter で共有する" name="send_to_twitter_btn"/> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index bcf4698bb0..9116bba8bb 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -5739,4 +5739,25 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Mav_Details_MAV_UNKNOWN_VERSION"> 物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。 </string> + <string name="couldnt_resolve_host"> + DNS がホスト名 ([HOSTNAME]) を解決できませんでした。 +www.secondlife.com のウェブサイトに接続できるかご確認ください。 +接続できても、このエラーが継続的に起こる場合は、 +サポートセクションから問題を報告してください。 + </string> + <string name="ssl_peer_certificate"> + ログインサーバーが SSL 経由で確認できませんでした。 +このエラーが継続的に起こる場合は、 +Secondlife.com のサポートセクションから +問題を報告してください。 + </string> + <string name="ssl_connect_error"> + この問題の多くは、お使いのコンピュータの時計が正しく設定されていないために起こります。 +コントロールパネルから時刻と日付が正しく設定されているかご確認ください。 +お使いのネットワークとファイアウォールも正しく設定されているかお確かめください。 +このエラーが継続的に起こる場合は、Secondlife.com のサポートセクションから +問題を報告してください。 + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 ナレッジベース] + </string> </strings> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml index 082dc0687e..55df13e7ac 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml @@ -4,7 +4,6 @@ Język: </text> <combo_box name="language_combobox"> - <combo_box.item label="Domyślny" name="System Default Language" /> <combo_box.item label="English (Angielski)" name="English" /> <combo_box.item label="Dansk (Duński) - Beta" name="Danish" /> <combo_box.item label="Deutsch (Niemiecki) - Beta" name="Deutsch(German)" /> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index fde883131a..b7a057e769 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -243,6 +243,10 @@ Por favor, selecione apenas um objeto e tente novamente. Nota: Ao ativar esta opção, qualquer pessoa que utilizar este computador poderá ver a sua lista de lugares preferidos. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + Não é possível executar múltiplos visualizadores Second Life. Pode levar a uma falha, um corrompimento, visuais alterados e falha no desempenho no cache de textura. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="GrantModifyRights"> Conceder direitos de modificação a outros residentes vai autorizá-los a mudar, apagar ou pegar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização. Deseja dar direitos de modificação a [NAME]? @@ -711,9 +715,9 @@ Para aumentar a qualidade do vídeo, vá para Preferências > Vídeo. Você não está autorizado a terraplanar o terreno [PARCEL]. </notification> <notification name="CannotCopyWarning"> - Você não tem autorização para copiar os itens abaixo: -[ITEMS] -ao dá-los, você ficará sem eles no seu inventário. Deseja realmente dar estes itens? + Não existe autorização para copiar os itens abaixo: +<nolink>[ITEMS]</nolink> +e eles sairão do inverntário se sair. Deseja realmente dar estes itens? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification name="CannotGiveItem"> @@ -3698,13 +3702,13 @@ ele não está na mesma região que você. Você não pode criar árvores e grama em terrenos que não são sua propriedade. </notification> <notification name="NoCopyPermsNoObject"> - A cópia falhou porque você não está autorizado a copiar o objeto '[OBJ_NAME]'. + Falha na cópia por falta de permissão para copiar o objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransPermsNoObject"> - A cópia falhou porque o objeto '[OBJ_NAME]' não pode ser transferido para você. + Falha na cópia, porque o objeto <nolink>'[OBJ_NAME]'</nolink> não pode ser transferido para você. </notification> <notification name="AddToNavMeshNoCopy"> - A cópia falhou porque o objeto '[OBJ_NAME]' contribui para o navmesh. + Falha na cópia, porque o objeto <nolink>'[OBJ_NAME]'</nolink> contribui para o Navmesh. </notification> <notification name="DupeWithNoRootsSelected"> Duplicar sem objetos raiz selecionados. @@ -3749,34 +3753,34 @@ Tente novamente em instantes. Salvar no inventário foi desativado. </notification> <notification name="NoExistNoSaveToContents"> - Não é possível salvar '[OBJ_NAME]' no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais. + Não foi possível salvar <nolink>'[OBJ_NAME]'</nolink> para os conteúdos do objeto, porque o objeto foi utilizado e não existe mais. </notification> <notification name="NoModNoSaveToContents"> - Não é possível salvar '[OBJ_NAME]' no conteúdo do objeto porque você não tem permissão para modificar o objeto '[DEST_NAME]'. + Não foi possível salvar <nolink>'[OBJ_NAME]'</nolink> para os conteúdos do objeto, porque você não tem permissão para modificar o objeto <nolink>'[DEST_NAME]'</nolink>. </notification> <notification name="NoSaveBackToInvDisabled"> - Não é possível salvar '[OBJ_NAME]' no inventário -- essa operação foi desativada. + Não é possível salvar <nolink>'[OBJ_NAME]'</nolink> no inventário outra vez -- esta operação foi desabilitada. </notification> <notification name="NoCopyNoSelCopy"> - Você não pode copiar sua seleção porque não está autorizado a copiar o objeto '[OBJ_NAME]'. + Não é possível copiar a seleção porque você não tem permissão para copiar o objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransNoSelCopy"> - Você não pode copiar a seleção porque o objeto '[OBJ_NAME]' não é transferível. + Não é possível copiar a seleção porque o objeto <nolink>'[OBJ_NAME]'</nolink> não é transferível. </notification> <notification name="NoTransNoCopy"> - Você não pode copiar a seleção porque o objeto '[OBJ_NAME]' não é transferível. + Não é possível copiar a seleção porque o objeto <nolink>'[OBJ_NAME]'</nolink> não é transferível. </notification> <notification name="NoPermsNoRemoval"> - A remoção do objeto '[OBJ_NAME]' do simulador é proibida pelo sistema de permissões. + A remoção do objeto <nolink>'[OBJ_NAME]'</nolink> do simulador não é permitida pelo sistema de permissão. </notification> <notification name="NoModNoSaveSelection"> - Você não pode salvar sua seleção porque não está autorizado a modificar o objeto '[OBJ_NAME]'. + Não é possível salvar a seleção porque você não tem permissão para modificar o objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoCopyNoSaveSelection"> - Não é possível salvar sua seleção porque o objeto '[OBJ_NAME]' não é copiável. + Não é possível salvar a seleção porque o objeto <nolink>'[OBJ_NAME]'</nolink> não é copiável. </notification> <notification name="NoModNoTaking"> - Você não pode levar sua seleção porque não está autorizado a modificar o objeto '[OBJ_NAME]'. + Não é possível realizar a seleção porque você não tem permissão para modificar o objeto <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="RezDestInternalError"> Erro interno: tipo de destino desconhecido. diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index 68fbd049b1..915d695605 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -4,7 +4,6 @@ Idioma: </text> <combo_box name="language_combobox"> - <combo_box.item label="Padrão" name="System Default Language"/> <combo_box.item label="English (Inglês)" name="English"/> <combo_box.item label="Dansk (Dinamarquês) - Beta" name="Danish"/> <combo_box.item label="Deutsch (Alemão) - Beta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index ecf90ef787..4151ef36ac 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -5615,4 +5615,25 @@ Tente colocar o caminho do editor entre aspas. <string name="Mav_Details_MAV_UNKNOWN_VERSION"> A forma física não tem a versão correta. Defina a versão correta para o modelo físico. </string> + <string name="couldnt_resolve_host"> + O DNS não pode resolver o nome do host([HOSTNAME]). +Verifique se você pode conectar ao site www.secondlife.com . Se você +puder, mas se continuar recebendo esta mensagem de erro, vá à sessão +Suporte no site Secondlife.com e informe o problema. + </string> + <string name="ssl_peer_certificate"> + O servidor de acesso não pôde verificá-lo pelo SSL. +Se você continuar recebendo esta mensagem de erro, +vá à sessão Suporte no site Secondlife.com +e informe o problema. + </string> + <string name="ssl_connect_error"> + Geralmente, esse erro significa que o relógio do seu computador não está com o horário correto. +Vá em Painel de Controles e certifique-se de que a hora e data estejam corretos. +Além disso, verifique se a sua rede e firewall estejam corretos. Se você continuar +recebendo esta mensagem de erro, vá à sessão Suporte no site Secondlife.com +e informe o problema. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Base de conhecimento] + </string> </strings> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 85314638c5..4801c22cc6 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -244,6 +244,10 @@ Примечание. После включения этой опции все пользователи данного компьютера смогут увидеть список ваших избранных мест. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="AllowMultipleViewers"> + Запуск нескольких приложений Second Life Viewer не поддерживается. Это может привести к конфликтам кэша текстур, повреждению и снижению производительности и визуального отображения. + <usetemplate name="okbutton" yestext="ОК"/> + </notification> <notification name="GrantModifyRights"> Предоставление другому жителю прав на изменение позволит ему изменять, удалять или брать ЛЮБЫЕ ваши объекты. Будьте ОЧЕНЬ осторожны с предоставлением такого разрешения. Дать пользователю [NAME] права на изменение? @@ -717,9 +721,9 @@ Вам не разрешено терраформировать участок [PARCEL]. </notification> <notification name="CannotCopyWarning"> - У вас нет разрешения на копирование следующих предметов: -[ITEMS] -Если вы отдадите эти вещи, их больше не будет в вашем инвентаре. Вы действительно хотите предложить эти предметы? + У вас нет разрешения на копирование следующих предметов: +<nolink>[ITEMS]</nolink> +и они пропадут из вашего инвентаря, если вы их отдадите. Вы действительно хотите предложить эти предметы? <usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/> </notification> <notification name="CannotGiveItem"> @@ -3711,13 +3715,13 @@ Вы не можете создавать деревья и траву на чужой земле. </notification> <notification name="NoCopyPermsNoObject"> - Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]». + Не удалось скопировать, потому что у вас нет разрешения на копирование этого предмета <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransPermsNoObject"> - Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам. + Не удалось скопировать, потому что предмет <nolink>'[OBJ_NAME]'</nolink> не может быть перемещён к вам. </notification> <notification name="AddToNavMeshNoCopy"> - Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке. + Не удалось скопировать, потому что предмет <nolink>'[OBJ_NAME]'</nolink> относится к навигационной сетке. </notification> <notification name="DupeWithNoRootsSelected"> Выбран дубликат без корневых объектов. @@ -3762,34 +3766,34 @@ Сохранение в инвентаре отключено. </notification> <notification name="NoExistNoSaveToContents"> - Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует. + Не удалось сохранить <nolink>'[OBJ_NAME]'</nolink> в содержимом предмета, потому что место, в котором был создан предмет, больше не существует. </notification> <notification name="NoModNoSaveToContents"> - Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]». + Не удалось сохранить <nolink>'[OBJ_NAME]'</nolink> в содержимом предмета, потому что у вас нет разрешения на модификацию предмета <nolink>'[DEST_NAME]'</nolink>. </notification> <notification name="NoSaveBackToInvDisabled"> - Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена. + Не удалось сохранить <nolink>'[OBJ_NAME]'</nolink> обратно в инвентаре – эта операция заблокирована. </notification> <notification name="NoCopyNoSelCopy"> - Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]». + Вы не можете скопировать выбор, потому что у вас нет разрешения на копирование этого предмета <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoTransNoSelCopy"> - Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится. + Вы не можете скопировать свой выбор, потому что предмет <nolink>'[OBJ_NAME]'</nolink> не может быть перемещён. </notification> <notification name="NoTransNoCopy"> - Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится. + Вы не можете скопировать свой выбор, потому что предмет <nolink>'[OBJ_NAME]'</nolink> не может быть перемещён. </notification> <notification name="NoPermsNoRemoval"> - Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений. + Удаление предмета <nolink>'[OBJ_NAME]'</nolink> из симулятора не допущено системой прав доступа. </notification> <notification name="NoModNoSaveSelection"> - Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]». + Копирование выбора невозможно, потому что у вас нет разрешения на модифицирование этого предмета <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="NoCopyNoSaveSelection"> - Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется. + Вы не можете сохранить свой выбор, потому что предмет <nolink>'[OBJ_NAME]'</nolink> не поддаётся копированию. </notification> <notification name="NoModNoTaking"> - Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]». + Вы не можете скопировать свой выбор, потому что у вас нет разрешения на модифицирование этого предмета <nolink>'[OBJ_NAME]'</nolink>. </notification> <notification name="RezDestInternalError"> Внутренняя ошибка: неизвестный тип места назначения. diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml index b15d0e3abf..918b042dd7 100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml @@ -4,7 +4,6 @@ Язык: </text> <combo_box name="language_combobox"> - <combo_box.item label="Язык системы" name="System Default Language"/> <combo_box.item label="English - Английский" name="English"/> <combo_box.item label="Dansk – датский (бета-версия)" name="Danish"/> <combo_box.item label="Deutsch – немецкий (бета-версия)" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 267c717189..dcc503f18c 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -5747,4 +5747,25 @@ support@secondlife.com. <string name="Mav_Details_MAV_UNKNOWN_VERSION"> У физической формы нет правильной версии. Задайте правильную версию для физической модели. </string> + <string name="couldnt_resolve_host"> + DNS не удалось разрешить имя узла([HOSTNAME]). +Проверьте возможность подключения к веб-сайту www.secondlife.com. +Если вы продолжаете получать эту ошибку, перейдите в раздел +поддержки и сообщите о проблеме. + </string> + <string name="ssl_peer_certificate"> + Серверу входа в систему не удалось пройти аутентификацию с помощью +протокола SSL. Если вы продолжаете получать эту ошибку, +перейдите в раздел поддержки на веб-сайте SecondLife.com +и сообщите о проблеме. + </string> + <string name="ssl_connect_error"> + Часто это означает, что часы компьютера установлены неправильно. +Перейдите, пожалуйста, на Панели управления и убедитесь в правильной +установке времени и даты. Также проверьте правильность настройки сети +и брандмауэра. Если вы продолжаете получать эту ошибку, перейдите в +раздел поддержки на веб-сайте SecondLife.com и сообщите о проблеме. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 База знаний] + </string> </strings> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 187638d488..291f8539b3 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -244,6 +244,10 @@ Lütfen sadece bir nesne seçin ve tekrar deneyin. Not: Bu seçeneği etkinleştirdiğinizde, bu bilgisayarı kullanan herkes en sevdiğiniz konumlar listenizi görebilecek. <usetemplate name="okbutton" yestext="Tamam"/> </notification> + <notification name="AllowMultipleViewers"> + Birden çok Second Life görüntüleyiciyi çalıştırma özelliği desteklenmiyor. Bu durum doku önbelleği çakışmalarına, görsellerin bozulmasına ve performansın düşmesine yol açabilir. + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> <notification name="GrantModifyRights"> Başka bir Sakine değişiklik yapma hakkı verdiğinizde, SL dünyasında sahip olduğunuz HERHANGİ BİR nesneyi değiştirebilme, silebilme veya alabilmelerine izin vermiş olursunuz. Bu izni verirken ÇOK dikkatli olun. [NAME] adlı kişiye değişiklik yapma hakkı vermek istiyor musunuz? @@ -718,9 +722,9 @@ Grafik Kalitesi, Tercihler > Grafikler sekmesinden yükseltilebilir. [PARCEL] parseli üzerinde yer şekillendirmesi yapma izniniz bulunmuyor. </notification> <notification name="CannotCopyWarning"> - Aşağıdaki öğeleri kopyalamak için gerekli izne sahip değilsiniz: -[ITEMS] -Bu öğeleri verdiğiniz takdirde envanterinizden çıkacaklar. Bu öğeleri teklif etmeyi gerçekten istiyor musunuz? + Aşağıdaki öğeleri kopyalama izniniz yok: +<nolink>[ITEMS]</nolink> +ve bunları elden çıkardığınız takdirde envanterinizden kaybolacaktır. Bu öğeleri sunmayı gerçekten istiyor musunuz? <usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/> </notification> <notification name="CannotGiveItem"> @@ -3710,13 +3714,13 @@ Girişim iptal edildi. Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız. </notification> <notification name="NoCopyPermsNoObject"> - '[OBJ_NAME]' nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı. + <nolink>'[OBJ_NAME]'</nolink> nesnesini kopyalama izniniz olmadığından kopyalama başarısız oldu. </notification> <notification name="NoTransPermsNoObject"> - '[OBJ_NAME]' nesnesi size aktarılamadığı için kopyalama başarılamadı. + <nolink>'[OBJ_NAME]'</nolink> nesnesi size devredilemediğinden kopyalama başarısız oldu. </notification> <notification name="AddToNavMeshNoCopy"> - '[OBJ_NAME]' nesnesi navmesh'e katkıda bulunduğu için kopyalama başarılamadı. + <nolink>'[OBJ_NAME]'</nolink> nesnesi navigasyon örgüsüne katkıda bulunduğundan kopyalama başarısız oldu. </notification> <notification name="DupeWithNoRootsSelected"> Kök nesne seçili olmayan kopya. @@ -3761,34 +3765,34 @@ Lütfen bir dakika sonra tekrar deneyin. Envantere Geri Kaydet devre dışı bırakıldı. </notification> <notification name="NoExistNoSaveToContents"> - '[OBJ_NAME]' nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil. + Yeniden canlandırıldığı nesne artık mevcut olmadığından <nolink>'[OBJ_NAME]'</nolink> nesne içeriklerine kaydedilemiyor. </notification> <notification name="NoModNoSaveToContents"> - '[DEST_NAME]' nesnesini değiştirme izniniz olmadığı için '[OBJ_NAME]' nesne içeriğine kaydedilemedi. + <nolink>'[DEST_NAME]'</nolink> nesnesini değiştirme izniniz olmadığından <nolink>'[OBJ_NAME]'</nolink> nesne içeriklerine kaydedilemiyor. </notification> <notification name="NoSaveBackToInvDisabled"> - '[OBJ_NAME]' envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı. + <nolink>'[OBJ_NAME]'</nolink> envantere tekrar kaydedilemiyor -- bu işlem devre dışı bırakılmış. </notification> <notification name="NoCopyNoSelCopy"> - '[OBJ_NAME]' nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız. + <nolink>'[OBJ_NAME]'</nolink> nesnesini kopyalama izniniz olmadığından seçiminizi kopyalayamazsınız. </notification> <notification name="NoTransNoSelCopy"> - '[OBJ_NAME]' nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız. + <nolink>'[OBJ_NAME]'</nolink> nesnesi devredilebilir olmadığından seçiminizi kopyalayamazsınız. </notification> <notification name="NoTransNoCopy"> - '[OBJ_NAME]' nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız. + <nolink>'[OBJ_NAME]'</nolink> nesnesi devredilebilir olmadığından seçiminizi kopyalayamazsınız. </notification> <notification name="NoPermsNoRemoval"> - Benzeticiden '[OBJ_NAME]' nesnesinin kaldırılmasına izinler sistemi izin vermiyor. + <nolink>'[OBJ_NAME]'</nolink> nesnesinin simülatörden kaldırılmasına izin sistemi tarafından izin verilmiyor. </notification> <notification name="NoModNoSaveSelection"> - '[OBJ_NAME]' nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz. + <nolink>'[OBJ_NAME]'</nolink> nesnesini değiştirme izniniz olmadığından seçiminiz kaydedilemiyor. </notification> <notification name="NoCopyNoSaveSelection"> - '[OBJ_NAME]' nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz. + <nolink>'[OBJ_NAME]'</nolink> nesnesi kopyalanabilir olmadığından seçiminiz kaydedilemiyor. </notification> <notification name="NoModNoTaking"> - '[OBJ_NAME]' nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız. + <nolink>'[OBJ_NAME]'</nolink> nesnesini değiştirme izniniz olmadığından seçiminizi alamazsınız. </notification> <notification name="RezDestInternalError"> Dahili Hata: Bilinmeyen hedef türü. diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml index 2c05e8a47a..cec7a67f2f 100644 --- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml @@ -4,7 +4,6 @@ Dil: </text> <combo_box name="language_combobox"> - <combo_box.item label="Sistem varsayılanı" name="System Default Language"/> <combo_box.item label="English (İngilizce)" name="English"/> <combo_box.item label="Dansk (Danca) - Beta" name="Danish"/> <combo_box.item label="Deutsch (Almanca) - Beta" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index b574420793..ea6f2115e4 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -5748,4 +5748,25 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Mav_Details_MAV_UNKNOWN_VERSION"> Fiziksel şekil doğru sürüme sahip değil. Fiziksel model için doğru sürümü ayarlayın. </string> + <string name="couldnt_resolve_host"> + DNS sunucusu ana bilgisayar adını çözümleyemedi ([HOSTNAME]). +Lütfen www.secondlife.com web sitesine bağlanabildiğinizi doğrulayın. +Bağlanabiliyor, ancak bu hatayı almaya devam ediyorsanız, lütfen +destek bölümüne gidin ve bu sorunu bildirin. + </string> + <string name="ssl_peer_certificate"> + Oturum açma sunucusu SSL aracılığıyla kendini doğrulayamadı. +Bu hatayı almaya devam ederseniz, lütfen +SecondLife.com web sitesinin Destek +bölümüne gidin ve sorunu bildirin. + </string> + <string name="ssl_connect_error"> + Çoğunlukla, bu durum, bilgisayarınızın saatinin yanlış ayarlandığı anlamına gelir. +Lütfen Denetim Masası'na gidin ve tarih ve saat ayarlarının doğru yapıldığından emin olun. +Ayrıca, ağınızın ve güvenlik duvarınızın doğru şekilde ayarlanıp ayarlanmadığını kontrol edin. +Bu hatayı almaya devam ederseniz, lütfen SecondLife.com web sitesinin Destek bölümüne +gidin ve sorunu bildirin. + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 Bilgi Bankası] + </string> </strings> diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml index 4cac07cd21..2f02316fc0 100644 --- a/indra/newview/skins/default/xui/zh/floater_tos.xml +++ b/indra/newview/skins/default/xui/zh/floater_tos.xml @@ -4,7 +4,7 @@ http://secondlife.com/app/tos/ </floater.string> <floater.string name="loading_url"> - data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E 正在載入 %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E + data:text/html;charset=utf-8,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E 正在載入 %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E </floater.string> <text name="tos_heading"> 請閱讀並遵守Second Life使用條款、隱私政策、服務條款，包括同意在發生爭議時接受仲裁並放棄採取集體或群體求訴的規定。 繼續登入[SECOND_LIFE]前，你必須同意這些條款。 diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index ea635d0e5d..e8b2481a7c 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -244,6 +244,10 @@ 注意：你一旦同意這選項，任何使用這部電腦的人都可看到你有哪些「最愛」地點。 <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="AllowMultipleViewers"> + 不支援同時執行多個Second Life瀏覽器。 這麼做可能導致材質快取相互碰撞、毀損，並降低視覺效果及性能。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="GrantModifyRights"> 賦予另一居民「修改」權，將允許他更改、刪除或拿取你在虛擬世界裡擁有的任何物件。 賦予這項權限時，敬請慎重考慮。 你仍要賦予 [NAME] 修改權嗎? @@ -719,7 +723,7 @@ </notification> <notification name="CannotCopyWarning"> 你沒有權限複製以下項目： -[ITEMS] +<nolink>[ITEMS]</nolink> 如果你將它送人，它將無法續留在收納區。 你確定要送出這些東西嗎？ <usetemplate name="okcancelbuttons" notext="否" yestext="是"/> </notification> @@ -3710,13 +3714,13 @@ SHA1 指紋：[MD5_DIGEST] 你無法在別人的土地上建立樹和草。 </notification> <notification name="NoCopyPermsNoObject"> - 複製失敗，你無權複製物件 '[OBJ_NAME]'。 + 複製失敗，你無權複製物件<nolink>'[OBJ_NAME]'</nolink>。 </notification> <notification name="NoTransPermsNoObject"> - 複製失敗，因為物件 '[OBJ_NAME]' 無法轉移給你。 + 複製失敗，因為物件<nolink>'[OBJ_NAME]'</nolink>無法轉移給你。 </notification> <notification name="AddToNavMeshNoCopy"> - 複製失敗，因為物件 '[OBJ_NAME]' 對導航網面有貢獻。 + 複製失敗，因為物件<nolink>'[OBJ_NAME]'</nolink>對導航網面有貢獻。 </notification> <notification name="DupeWithNoRootsSelected"> 選取了沒有根的重覆物件。 @@ -3761,34 +3765,34 @@ SHA1 指紋：[MD5_DIGEST] 「儲存回收納區」功能已被停用。 </notification> <notification name="NoExistNoSaveToContents"> - 無法將 '[OBJ_NAME]' 儲存到物件內容，因為產生它的來源物件已不存在。 + 無法將<nolink>'[OBJ_NAME]'</nolink>儲存到物件內容，因為產生它的來源物件已不存在。 </notification> <notification name="NoModNoSaveToContents"> - 無法儲存 [OBJ_NAME] 到物件內容，你無權修改 '[DEST_NAME]' 物件。 + 無法儲存<nolink>'[OBJ_NAME]'</nolink>到物件內容，因爲你無權修改<nolink>'[DEST_NAME]'</nolink>物件。 </notification> <notification name="NoSaveBackToInvDisabled"> - 無法將 '[OBJ_NAME]' 儲存回收納區，此動作已被停用。 + 無法將<nolink>'[OBJ_NAME]'</nolink>儲存回收納區，此動作已被停用。 </notification> <notification name="NoCopyNoSelCopy"> - 無法複製你所選的，因為你無權複製物件 '[OBJ_NAME]'。 + 無法複製你所選的，因為你無權複製物件<nolink>'[OBJ_NAME]'</nolink>。 </notification> <notification name="NoTransNoSelCopy"> - 無法選取複製，因為物件 '[OBJ_NAME]' 不可轉移。 + 無法選取複製，因為物件<nolink>'[OBJ_NAME]'</nolink>不可轉移。 </notification> <notification name="NoTransNoCopy"> - 無法選取複製，因為物件 '[OBJ_NAME]' 不可轉移。 + 無法選取複製，因為物件<nolink>'[OBJ_NAME]'</nolink>不可轉移。 </notification> <notification name="NoPermsNoRemoval"> - 權限系統不允許從模擬器移除物件 '[OBJ_NAME]'。 + 權限系統不允許從模擬器移除物件<nolink>'[OBJ_NAME]'</nolink>。 </notification> <notification name="NoModNoSaveSelection"> - 無法儲存你所選的，因為你無權修改 '[OBJ_NAME]' 物件。 + 無法儲存你所選的，因為你無權修改<nolink>'[OBJ_NAME]'</nolink>物件。 </notification> <notification name="NoCopyNoSaveSelection"> - 無法儲存你所選的，因為物件 '[OBJ_NAME]' 不可複製。 + 無法儲存你所選的，因為物件<nolink>'[OBJ_NAME]'</nolink>不可複製。 </notification> <notification name="NoModNoTaking"> - 無法拿取你所選的，因為你無權修改 '[OBJ_NAME]' 物件。 + 無法取用你所選的，因為你無權修改物件<nolink>'[OBJ_NAME]'</nolink>。 </notification> <notification name="RezDestInternalError"> 內部錯誤：未知的目的地類型。 diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml index 20335d82ae..87c38e4346 100644 --- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml @@ -4,7 +4,6 @@ 語言： </text> <combo_box name="language_combobox"> - <combo_box.item label="系統預設" name="System Default Language"/> <combo_box.item label="英語" name="English"/> <combo_box.item label="Dansk（丹麥語）- 試用版" name="Danish"/> <combo_box.item label="Deutsch（德語）- 試用版" name="Deutsch(German)"/> diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index 24d8dc60cb..f8fd727145 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -5746,4 +5746,25 @@ http://secondlife.com/support 求助解決問題。 <string name="Mav_Details_MAV_UNKNOWN_VERSION"> 物理形狀的版本不正確。 請設成正確的物理模型版本。 </string> + <string name="couldnt_resolve_host"> + DNS無法解決主機名稱（[HOSTNAME]）。 +請確認你能夠連通 www.secondlife.com +網站。 如能連通，但繼續看到這個錯誤， +請到「支援」部分通報問題。 + </string> + <string name="ssl_peer_certificate"> + 登入伺服器無法透過SSL自我確認。 +如果你繼續看到這個錯誤，請前往 +SecondLife.com網站的「支援」部分 +提報問題。 + </string> + <string name="ssl_connect_error"> + 這通常意味你電腦的時鐘設定不正確。 +請到控制台確定時間和日期設定正確。 +並檢查確定你的網路和防火牆設定正確。 +如果你繼續看到這個錯誤，請前往SecondLife.com +網站的「支援」部分提報問題。 + +[https://community.secondlife.com/knowledgebase/english/error-messages-r520/#Section__3 知識庫] + </string> </strings> |