diff options
Diffstat (limited to 'indra/newview/skins/default')
43 files changed, 193 insertions, 134 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml index af9ee0bd06..bd8ecb92e9 100644 --- a/indra/newview/skins/default/xui/da/floater_tos.xml +++ b/indra/newview/skins/default/xui/da/floater_tos.xml @@ -8,7 +8,9 @@ </floater.string> <button label="Fortsæt" label_selected="Fortsæt" name="Continue"/> <button label="Annullér" label_selected="Annullér" name="Cancel"/> - <check_box label="Jeg er enig med "Terms of Service and Privacy Policy"" name="agree_chk"/> + <text name="agree_list"> + Jeg er enig med "Terms of Service and Privacy Policy" + </text> <text name="tos_heading"> Læs venligst følgende "Terms of Service and Privacy Policy" grundigt. For at fortsætte med at logge på [SECOND_LIFE], skal du acceptere aftale. </text> diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml index 636c2629da..47551d2a82 100644 --- a/indra/newview/skins/default/xui/de/floater_tos.xml +++ b/indra/newview/skins/default/xui/de/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> Sie müssen sich unter https://my.secondlife.com anmelden und die Servicebedingungen akzeptieren, bevor Sie fortfahren können. Vielen Dank! </text> - <check_box label="Ich habe die" name="agree_chk"/> <text name="agree_list"> - Allgemeinen Geschäftsbedingungen, die Datenschutzrichtlinie sowie die Servicebedingungen inklusive der Anforderungen zur Streitschlichtung gelesen und akzeptiere diese. - </text> - <button label="Weiter" label_selected="Weiter" name="Continue"/> + Ich habe die Allgemeinen Geschäftsbedingungen, die Datenschutzrichtlinie sowie die Servicebedingungen inklusive der Anforderungen zur Streitschlichtung gelesen und akzeptiere diese. + </text> + <button label="Weiter" label_selected="Weiter" name="Continue" top_delta="45"/> <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 113cbc276a..aefe30813c 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2505,7 +2505,7 @@ Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion a <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] Objekte werden dauerhaft gelöscht. Möchten Sie den Inhalt Ihres Papierkorbs wirklich dauerhaft löschen? + [COUNT] Bestellungen und Ordner werden dauerhaft gelöscht. Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs dauerhaft löschen möchten? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3511,12 +3511,18 @@ Bitte überprüfen Sie Ihre Netzwerk- und Firewalleinstellungen. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Verbindung mit Voice-Server ist leider nicht möglich: + Wir können uns nicht mit dem Voice-Server verbinden: [HOSTID] -Voice-Kommunikation ist leider nicht verfügbar. -Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup. +Ports, die für Sprache erlaubt sein müssen, sind: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Bitte überprüfen Sie Ihre Netzwerk- und Firewall-Einstellungen. +Deaktivieren Sie alle SIP-ALG-Funktionen in Ihrem Router. + +Sprachkommunikation ist nicht möglich. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml index d265f040ab..a3adea9fa2 100644 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sonstiges" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Inventar ([ITEM_COUNT] Artikel werden abgerufen... [FILTER] + Holen von [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordnern... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] Objekte [FILTER] + [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Abgerufen: [ITEM_COUNT] Artikel [FILTER] + Geholte [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER] </panel.string> <text name="ItemcountText"> Objekte: diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index a8e14fc20f..7ddcab9d34 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -278,9 +278,8 @@ Wenn Sie der Ansicht sind, dass Sie diese Meldung fälschlicherweise erhalten ha Abmeldeanforderung führte zu einem Simulatorfehler. </string> <string name="LoginFailedPendingLogout"> - Das System meldet Sie gerade ab. -Ihr Konto ist erst ab -[TIME] Pacific Time wieder verfügbar. + Das System meldet Sie gerade ab. +Bitte warten Sie eine Minute, bevor Sie sich erneut einloggen. </string> <string name="LoginFailedUnableToCreateSession"> Es kann keine gültige Sitzung erstellt werden. @@ -1512,6 +1511,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo <string name="InventoryMarketplaceListingsNoItems"> Ziehen Sie Ordner in diesen Bereich, um sie im [[MARKETPLACE_DASHBOARD_URL] Marktplatz] zum Verkauf anzubieten. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Artikel ) + </string> <string name="Marketplace Validation Warning Stock"> Bestandsordner müssen in einem Versionsordner gespeichert sein </string> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 22cc058e46..9fe56e447e 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -702,16 +702,6 @@ This parcel is 512 m² of land. right="400"> You have L$ 2,100. </text> - <check_box - follows="bottom|left" - height="20" - label="Remove [AMOUNT] m² of contribution from group." - layout="topleft" - left_delta="3" - name="remove_contribution" - top_delta="14" - visible="false" - width="275" /> <button follows="bottom|left" height="20" @@ -721,6 +711,15 @@ This parcel is 512 m² of land. name="buy_btn" top="460" width="100" /> + <check_box + follows="bottom|left" + height="20" + label="Remove [AMOUNT] m² of contribution from group." + layout="topleft" + left_pad="3" + name="remove_contribution" + visible="false" + width="275" /> <button follows="bottom|right" height="20" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 76adaad57c..e50747cb5f 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -127,7 +127,7 @@ top_delta="0" width="31" /> <panel - height="154" + height="159" layout="topleft" follows="top|left" left="0" @@ -250,7 +250,7 @@ left="0" name="panel_container" default_panel_name="panel_snapshot_options" - top_pad="10" + top_pad="5" width="215"> <panel class="llpanelsnapshotoptions" diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 550af03683..82027d9e7c 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -4,6 +4,7 @@ <font name="default" comment="default font files (global fallbacks)"> <file>DejaVuSans.ttf</file> <os name="Windows"> + <file>meiryo.TTC</file> <file>MSGOTHIC.TTC</file> <file>gulim.ttc</file> <file>simhei.ttf</file> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 81bb83f133..dcd8f0b495 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2373,16 +2373,6 @@ function="ToggleControl" parameter="DebugShowMemory" /> </menu_item_check> - <menu_item_check - label="Show Private Mem Info" - name="Show Private Mem Info"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowPrivateMem" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowPrivateMem" /> - </menu_item_check> <menu_item_separator/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5f30a7e87d..0a220e68fd 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -159,8 +159,7 @@ Your account is not accessible until If you feel this is an error, please contact support@secondlife.com.</string> <string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string> <string name="LoginFailedPendingLogout">The system is logging you out right now. -Your Account will not be available until -[TIME] Pacific Time.</string> +Please wait a minute before you try logging in again.</string> <string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string> <string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string> <string name="LoginFailedRestrictedHours">Your account can only access Second Life diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml index 412e0501a0..8d83eb5b24 100644 --- a/indra/newview/skins/default/xui/es/floater_tos.xml +++ b/indra/newview/skins/default/xui/es/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> Para poder proseguir, debes iniciar sesión en https://my.secondlife.com y aceptar las Condiciones del servicio. Gracias. </text> - <check_box label="He leído y acepto" name="agree_chk"/> <text name="agree_list"> - los Términos y Condiciones, la Política de privacidad y las Condiciones del servicio de Second Life, incluyendo los requerimientos para resolver disputas. - </text> + He leído y acepto los Términos y Condiciones, la Política de privacidad y las Condiciones del servicio de Second Life, incluyendo los requerimientos para resolver disputas. + </text> <button label="Continuar" label_selected="Continuar" name="Continue"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 1b2ffcc7d4..151886875b 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -2499,7 +2499,7 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] elementos serán borrados de forma permanente. ¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera? + [COUNT] los objetos y las carpetas se borrarán de forma permanente. ¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/> </notification> <notification name="TrashIsFull"> @@ -3497,12 +3497,18 @@ Comprueba la configuración de la red y del servidor de seguridad. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Tenemos problemas de conexión con tu servidor de voz: + No se pudo establecer una conexión con el servidor de voz: -[HOSTID] +[HOSTID] + +Los puertos que deben estar activos para el servicio de voz son: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Comprueba la configuración de la red y del servidor de seguridad. +Desactiva las funciones SIP ALG de tu router. No podrás establecer comunicaciones de voz. -Comprueba la configuración de la red y del servidor de seguridad. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml index 5924dc7b9a..1252c7ce0d 100644 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Cosas" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Obtenidos [ITEM_COUNT] ítems... [FILTER] + Obteniendo [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] ítems [FILTER] + [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Obtenidos [ITEM_COUNT] ítems [FILTER] + [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas Obtenidos [FILTER] </panel.string> <text name="ItemcountText"> Ítems: diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 9eef5d2d41..c4744a8222 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -269,9 +269,8 @@ Si crees que se trata de un error, ponte en contacto con support@secondlife.com. La solicitud de cierre de sesión ha obtenido como resultado un error del simulador. </string> <string name="LoginFailedPendingLogout"> - El sistema está cerrando tu sesión en estos momentos. -Tu cuenta no estará disponible hasta las -[HORA] (horario de la costa del Pacífico). + El sistema te desconectará. +Por favor, aguarda un momento antes de intentar conectarte nuevamente. </string> <string name="LoginFailedUnableToCreateSession"> No se ha podido crear una sesión válida. @@ -1494,6 +1493,9 @@ Si sigues recibiendo el mismo mensaje, solicita ayuda al personal de asistencia <string name="InventoryMarketplaceListingsNoItems"> Arrastra carpetas a esta sección para incluirlas en la lista de venta del [[MARKETPLACE_DASHBOARD_URL] Mercado]. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Objetos) + </string> <string name="Marketplace Validation Warning Stock"> La carpeta de stock debe estar contenida en una carpeta de versión </string> diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml index 124a8ffee2..4e359e6482 100644 --- a/indra/newview/skins/default/xui/fr/floater_tos.xml +++ b/indra/newview/skins/default/xui/fr/floater_tos.xml @@ -12,9 +12,8 @@ <text name="external_tos_required"> Vous devez vous rendre sur https://my.secondlife.com et vous connecter pour accepter les Conditions d’utilisation avant de pouvoir continuer. Merci ! </text> - <check_box label="J'ai lu et j'accepte" name="agree_chk"/> <text name="agree_list"> - les termes et conditions; la Politique de confidentialité et les Conditions d'utilisation de Second Life, y compris ls exigences de résolution des différends. + J'ai lu et j'accepte les termes et conditions; la Politique de confidentialité et les Conditions d'utilisation de Second Life, y compris ls exigences de résolution des différends. </text> <button label="Continuer" label_selected="Continuer" name="Continue"/> <button label="Annuler" label_selected="Annuler" name="Cancel"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 1df2850cb3..faa744d8da 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -2492,7 +2492,7 @@ Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] objets seront supprimés définitivement. Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ? + [COUNT] les objets et les dossiers seront supprimés définitivement. Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3498,12 +3498,18 @@ Veuillez vérifier la configuration de votre réseau et de votre pare-feu. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Problèmes de connexion à votre serveur vocal : + La connexion au serveur vocal est impossible : [HOSTID] +Les ports autorisés pour la voix sont : +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Veuillez vérifier la configuration de votre réseau et de votre pare-feu. +Veuillez désactiver toute fonctionnalité SIP ALG dans votre routeur. + Aucune communication vocale n'est disponible. -Veuillez vérifier la configuration de votre réseau et de votre pare-feu. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml index 11488af119..5bcee89752 100644 --- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Choses" name="main inventory panel"> <panel.string name="ItemcountFetching"> - [ITEM_COUNT] articles récupérés... [FILTER] + Recherche [ITEM_COUNT] d'articles et [CATEGORY_COUNT] de dossiers... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] articles [FILTER] + [ITEM_COUNT] Articles et [CATEGORY_COUNT] dossiers [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - [ITEM_COUNT] articles [FILTER] récupérés + Recherche effectuée [ITEM_COUNT] d'articles et [CATEGORY_COUNT] de dossiers [FILTER] </panel.string> <text name="ItemcountText"> Articles : diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 58aab5e7b8..599ef126da 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -278,9 +278,8 @@ Si vous pensez qu'il s'agit d'une erreur, contactez l'Assist Le simulateur a renvoyé une erreur en réponse à la demande de déconnexion. </string> <string name="LoginFailedPendingLogout"> - Le système est en train de vous déconnecter. -Votre compte sera indisponible jusqu'à -[TIME], heure du Pacifique. + Le système est en train de vous déconnecter. +Veuillez réessayer de vous connecter dans une minute. </string> <string name="LoginFailedUnableToCreateSession"> Impossible de créer de session valide. @@ -1512,6 +1511,9 @@ Si vous continuez de recevoir ce message, contactez l’assistance Second Life <string name="InventoryMarketplaceListingsNoItems"> Pour mettre des dossiers en vente sur la [[MARKETPLACE_DASHBOARD_URL] Place du marché], faites-les glisser vers cette zone. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Articles ) + </string> <string name="Marketplace Validation Warning Stock"> le dossier de stock doit être contenu dans un dossier de version </string> diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml index 8fa74e0fca..0016df1882 100644 --- a/indra/newview/skins/default/xui/it/floater_tos.xml +++ b/indra/newview/skins/default/xui/it/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> Per continuare, visita https://my.secondlife.com e accedi per accettare i Termini del servizio. Grazie. </text> - <check_box label="Ho letto e sono d’accordo con" name="agree_chk"/> <text name="agree_list"> - i Termini e le Condizioni di Second Life, le clausole di riservatezza, i Termini del Servizio, compresi i requisiti per la risoluzione delle dispute. - </text> + Ho letto e sono d’accordo con i Termini e le Condizioni di Second Life, le clausole di riservatezza, i Termini del Servizio, compresi i requisiti per la risoluzione delle dispute. + </text> <button label="Continua" label_selected="Continua" name="Continue"/> <button label="Annulla" label_selected="Annulla" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index e556381f8f..8714fc9170 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -2496,7 +2496,7 @@ Vuoi disattivare la modalità Non disturbare prima di completare questa transazi <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] oggetti verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino? + [COUNT] oggetti e cartelle verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3501,12 +3501,18 @@ Ti consigliamo di controllare le tue impostazioni di rete e della firewall. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - A causa di problemi di connessione al server vocale + Non riusciamo a collegarci al server voce: [HOSTID] -le comunicazioni tramite voce non saranno disponibili. -Ti consigliamo di controllare le tue impostazioni di rete e della firewall. +porte che devono avere il permesso voce sono: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Controlla le tue impostazione di rete e della firewall. +Disabilita la funzione SIP ALG del router. + +La comunicazione voce non sará possibile. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml index 6121651ea8..5d11967cee 100644 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Cose" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Recupero di [ITEM_COUNT] oggetti... [FILTER] + Recupero di [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] oggetti [FILTER] + [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Recuperati [ITEM_COUNT] elementi [FILTER] + Recuperati [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER] </panel.string> <text name="ItemcountText"> Oggetti: diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 15fa594aae..75bfb9119b 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -275,9 +275,8 @@ Se ritieni che si tratta di un errore, contatta support@secondlife.com. Errore del simulatore in seguito alla richiesta di logout. </string> <string name="LoginFailedPendingLogout"> - Il sistema sta eseguendo il logout in questo momento. -Il tuo account non sarà disponibile fino alle -[TIME] fuso orario del Pacifico. + Il sistema sta eseguendo il logout in questo momento. +Prova ad accedere nuovamente tra un minuto. </string> <string name="LoginFailedUnableToCreateSession"> Non è possibile creare una sessione valida. @@ -1503,6 +1502,9 @@ Se continui a ricevere questo messaggio, contatta l'assistenza Second Life <string name="InventoryMarketplaceListingsNoItems"> Trascina le cartelle in questa area per metterle in vendita su [[MARKETPLACE_DASHBOARD_URL] Marketplace]. </string> + <string name="InventoryItemsCount"> + ( [ITEM_COUNT] oggetti ) + </string> <string name="Marketplace Validation Warning Stock"> la cartella di magazzino deve essere inclusa in una cartella di versione </string> diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml index 28e51e6d63..8045a1f1f7 100644 --- a/indra/newview/skins/default/xui/ja/floater_tos.xml +++ b/indra/newview/skins/default/xui/ja/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> 操作を続けるに、https://my.secondlife.com に移動し、利用規約に同意する必要があります。 </text> - <check_box label="私は以下の内容を読み、同意します。" name="agree_chk"/> <text name="agree_list"> - Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）。 - </text> + 私は以下の内容を読み、同意します。Second Life の利用規約、プライバシーポリシー、およびサービス規約（紛争解決のための必要条件を含む）。 + </text> <button label="続行" label_selected="続行" name="Continue"/> <button label="取り消し" label_selected="取り消し" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 75cd429823..f76ee9033b 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -2531,7 +2531,7 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] アイテムが完全に削除されます。ごみ箱の項目をすべて削除しますか？ + [COUNT] 個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除しますか？ <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3536,12 +3536,18 @@ M キーを押して変更します。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - ボイスサーバーに接続できません： + ボイスサーバーに接続できません： 音声に許可される必要のある [HOSTID] -ボイスチャットによるコミュニケーションが利用できません。 +ポート: +:TCP:80, 443 +:UDP:3478, 3479, 5060, 5062, 6250, 12000-32000 + お使いのネットワークやファイアウォールの設定を確認してください。 +お使いのルーターの SIP ALG 機能をすべて無効にしてください。 + +ボイスチャットによるコミュニケーションが利用できません。 <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index dce3475585..5751154163 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="もの" name="main inventory panel"> <panel.string name="ItemcountFetching"> - [ITEM_COUNT] 個のアイテムを取得中です... [FILTER] + [ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得中です... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] 個のアイテム [FILTER] + [ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダー [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - [ITEM_COUNT] 個の取得アイテム [FILTER] + [ITEM_COUNT] 個のアイテムと [CATEGORY_COUNT] 個のフォルダーを取得しました [FILTER] </panel.string> <text name="ItemcountText"> アイテム： diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 1d1b8a0fff..5d3fb1787e 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -279,8 +279,7 @@ support@secondlife.com にお問い合わせください。 </string> <string name="LoginFailedPendingLogout"> システムによるログアウトが実行されました。 -あなたのアカウントは -太平洋時間の [TIME] までご利用いただけません。 +しばらくしてから再度お試しください。 </string> <string name="LoginFailedUnableToCreateSession"> 有効なセッションを生成できません。 @@ -1511,6 +1510,9 @@ support@secondlife.com にお問い合わせください。 <string name="InventoryMarketplaceListingsNoItems"> [[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。 </string> + <string name="InventoryItemsCount"> + （[ITEMS_COUNT] 個のアイテム） + </string> <string name="Marketplace Validation Warning Stock"> バージョンフォルダに在庫フォルダが含まれなければなりません </string> diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml index c3bc528d17..789c65a16e 100644 --- a/indra/newview/skins/default/xui/pl/floater_tos.xml +++ b/indra/newview/skins/default/xui/pl/floater_tos.xml @@ -5,7 +5,9 @@ </floater.string> <button label="Kontynuuj" label_selected="Kontynuuj" name="Continue" /> <button label="Anuluj" label_selected="Anuluj" name="Cancel" /> - <check_box label="Zgadzam się na Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy)" name="agree_chk" /> + <text name="agree_list"> + Zgadzam się na Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy) + </text> <text name="tos_heading"> Proszę dokładnie przeczytać Warunki korzystania z Usług (Terms of Service) i Politykę Prywatności (Privacy Policy). Musisz je zaakceptować, aby kontynuować logowanie. </text> diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml index f8b2bc4aa7..09a90bc76c 100644 --- a/indra/newview/skins/default/xui/pt/floater_tos.xml +++ b/indra/newview/skins/default/xui/pt/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> Antes de continuar, você precisará visitar https://my.secondlife.com e fazer login para aceitar os Termos de Serviço. Obrigado! </text> - <check_box label="Li e concordo" name="agree_chk"/> <text name="agree_list"> - os Termos e condições, Política de privacidade e Termos de serviço do Second Life, incluindo as exigências para resolver disputas. - </text> + Li e concordo os Termos e condições, Política de privacidade e Termos de serviço do Second Life, incluindo as exigências para resolver disputas. + </text> <button label="Continuar" label_selected="Continuar" name="Continue"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 1113ce2848..d22e0f7bb7 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -2484,7 +2484,7 @@ Deseja desativar o Não perturbe antes de concluir esta transação? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] itens serão excluídos permanentemente. Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre? + [COUNT] itens e pastas serão excluídas permanentemente. Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3486,12 +3486,18 @@ Verifique a configuração da sua rede e firewall. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Estamos tendo problemas de conexão com o seu servidor de voz: + Não conseguimos conectar ao servidor de voz: [HOSTID] +As portas que devem ter permissão para voz são: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Verifique a configuração da sua rede e firewall. +Desativar qualquer configuração SIP ALG em seu router. + Talvez não seja possível se comunicar via voz. -Verifique a configuração da sua rede e firewall. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml index cde53518d0..009b5b3193 100644 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Coisas" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Reunindo [ITEM_COUNT] itens ... [FILTER] + Reunir [ITEM_COUNT] Itens e [CATEGORY_COUNT] Pastas... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] itens [FILTER] + [ITEM_COUNT] Itens e [CATEGORY_COUNT] Pastas [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Recuperados [ITEM_COUNT] itens [FILTER] + Itens [ITEM_COUNT] e Pastas [CATEGORY_COUNT] Reunidos [FILTER] </panel.string> <text name="ItemcountText"> Itens: diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 9e24296edd..c1acab097d 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -248,7 +248,8 @@ Entre em contato com o suporte do Second Life para obter ajuda em http://support Reação à solicitação de saída foi uma falha do simulador. </string> <string name="LoginFailedPendingLogout"> - O sistema está passando para o modo offline. Sua conta não está disponível para acesso até [TIME], horário do Pacífico nos EUA (GMT-08). + O sistema o está desconectando no momento. +Aguarde um minuto antes que tentar logar-se novamente. </string> <string name="LoginFailedUnableToCreateSession"> Impossível criar sessão válida. @@ -1460,6 +1461,9 @@ Se você continuar a receber essa mensagem, entre em contato com o suporte do Se <string name="InventoryMarketplaceListingsNoItems"> Arraste pastas para esta área para listá-las para venda no [Marketplace [MARKETPLACE_DASHBOARD_URL]]. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Items ) + </string> <string name="Marketplace Validation Warning Stock"> a pasta de estoque deve estar em uma pasta de versões </string> diff --git a/indra/newview/skins/default/xui/ru/floater_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml index 4c53fc9038..4cfdf5af70 100644 --- a/indra/newview/skins/default/xui/ru/floater_tos.xml +++ b/indra/newview/skins/default/xui/ru/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> Для продолжения перейдите на сайт https://my.secondlife.com, войдите и примите Условия обслуживания. Спасибо! </text> - <check_box label="Я прочитал и согласен с" name="agree_chk"/> <text name="agree_list"> - условия и положения по конфиденциальности Пользовательского соглашения, включая требования по разрешению разногласий. - </text> + Я прочитал и согласен с условиями и положениями по конфиденциальности Пользовательского соглашения, включая требования по разрешению разногласий. + </text> <button label="Продолжить" label_selected="Продолжить" name="Continue"/> <button label="Отмена" label_selected="Отмена" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index cfc6dc7ffd..0996224932 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -2491,7 +2491,7 @@ http://secondlife.com/download. <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - Предметы [COUNT] будут удалены навсегда. Вы действительно хотите удалить содержимое корзины без возможности восстановления? + [COUNT] предметов(а) и папки будут окончательно удалены. Вы действительно хотите удалить содержимое корзины без возможности восстановления? <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/> </notification> <notification name="TrashIsFull"> @@ -3497,12 +3497,18 @@ http://secondlife.com/download. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NoVoiceConnect"> - Возникли проблемы соединения с голосовым сервером: + Нет связи с речевым сервером: порты -[HOSTID] +[HOSTID], -Голосовая связь будет недоступна. -Проверьте настройки сети и брандмауэра. +выделенные для голосового соединения: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Проверьте настройки сети и брандмауэра. +Отключите любую функцию SIP ALG в маршрутизаторе. + +Голосовое общение будет недоступно. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml index d83bb9b569..f2502bf6d3 100644 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Вещи" name="main inventory panel"> <panel.string name="ItemcountFetching"> - Обнаружено [ITEM_COUNT] вещей... [FILTER] + Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок ... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] вещей [FILTER] + [ITEM_COUNT] предметов(а) и [CATEGORY_COUNT] папки(ок) [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Извлечено [ITEM_COUNT] вещей [FILTER] + Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER] </panel.string> <text name="ItemcountText"> Вещи: diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 4ebfa9cdcf..b94c417ef0 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -278,9 +278,8 @@ support@secondlife.com. В ответ на запрос выхода симулятор возвратил сообщение о сбое. </string> <string name="LoginFailedPendingLogout"> - В системе выполняется выход для вашего аккаунта. -Она будет недоступна до -[TIME] по тихоокеанскому времени. + В системе выполняется выход для вашего аккаунта. +Подождите минуту перед повторным входом в систему. </string> <string name="LoginFailedUnableToCreateSession"> Не удается создать допустимый сеанс. @@ -1509,6 +1508,9 @@ support@secondlife.com. <string name="InventoryMarketplaceListingsNoItems"> Перетащите папки в эту область, чтобы выставить их на продажу в [[MARKETPLACE_DASHBOARD_URL] Торговом центре]. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] предметов(а)) + </string> <string name="Marketplace Validation Warning Stock"> В папке версии должна быть папка запасов </string> diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml index 249a0f691e..9c0249526a 100644 --- a/indra/newview/skins/default/xui/tr/floater_tos.xml +++ b/indra/newview/skins/default/xui/tr/floater_tos.xml @@ -12,9 +12,8 @@ <text name="external_tos_required"> Devam edebilmeniz için https://my.secondlife.com adresine gidip oturum açarak Hizmet Sözleşmesi'ni kabul etmeniz gerekir. Teşekkürler! </text> - <check_box label="Uyuşmazlıkların çözümü gerekliliklerini içeren Second Life Şartlar ve Koşulları, Gizlilik Politikası'nı ve Hizmet Koşulları'nı" name="agree_chk"/> <text name="agree_list"> - okudum ve kabul ediyorum. + Uyuşmazlıkların çözümü gerekliliklerini içeren Second Life Şartlar ve Koşulları, Gizlilik Politikası'nı ve Hizmet Koşulları'nı okudum ve kabul ediyorum. </text> <button label="Devam Et" label_selected="Devam Et" name="Continue"/> <button label="İptal" label_selected="İptal" name="Cancel"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index deec5540dd..1deda01de8 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -2491,7 +2491,7 @@ Bu işlemi tamamlamadan önce Rahatsız Etme'yi kapatmak ister misiniz? <usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT] öğe kalıcı olarak silinecektir. Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinize emin misiniz? + [COUNT] öğe ve klasör kalıcı olarak silinecektir. Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinizden emin misiniz? <usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/> </notification> <notification name="TrashIsFull"> @@ -3497,12 +3497,18 @@ Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. <usetemplate name="okbutton" yestext="Tamam"/> </notification> <notification name="NoVoiceConnect"> - Ses sunucunuz ile bağlantı kurma konusunda sorun yaşıyoruz. + Ses sunucusuna bağlanamıyoruz: Ses için izin verilmesi gereken [HOSTID] -Ses bağlantıları kullanılamayacak. -Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. +Portları: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. +Yönlendiricinizdeki her SIP ALG özelliğini devre dışı bırakın. + +Sesli iletişim kullanılamayacak. <usetemplate name="okbutton" yestext="Tamam"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml index 01252ff454..a11fd98b9a 100644 --- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Eşyalar" name="main inventory panel"> <panel.string name="ItemcountFetching"> - [ITEM_COUNT] Öge Alınıyor... [FILTER] + [ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alınıyor... [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] Öge [FILTER] + [ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör [FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - Alınan [ITEM_COUNT] Öğe [FILTER] + [ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alındı [FILTER] </panel.string> <text name="ItemcountText"> Ögeler: diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index 735d2ea93a..c2f7b7bdc6 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -278,9 +278,8 @@ Bunun bir hata olduğunu düşünüyorsanız, lütfen şu adrese başvurun: supp Oturum kapatma talebi simülatörden bir hata yanıtı gelmesine neden oldu. </string> <string name="LoginFailedPendingLogout"> - Sistem şu anda oturumunuzu sonlandırıyor. -Hesabınıza şu zamana kadar erişemeyeceksiniz: -Pasifik Saati ile [TIME]. + Sistem şu anda oturumunuzu kapatıyor. +Lütfen yeniden oturum açmayı denemeden önce bir dakika bekleyin. </string> <string name="LoginFailedUnableToCreateSession"> Geçerli bir oturum oluşturulamadı. @@ -1509,6 +1508,9 @@ Bu mesaj size gelmeye devam ederse lütfen http://support.secondlife.com adresin <string name="InventoryMarketplaceListingsNoItems"> Klasörleri [[MARKETPLACE_DASHBOARD_URL] Pazaryerinde] satılık olarak listelemek için bu alana sürükleyin. </string> + <string name="InventoryItemsCount"> + ( [ITEMS_COUNT] Öğe ) + </string> <string name="Marketplace Validation Warning Stock"> stok klasörü bir sürüm klasöründe bulunmalıdır </string> diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml index 4e028c849f..cde6445e34 100644 --- a/indra/newview/skins/default/xui/zh/floater_tos.xml +++ b/indra/newview/skins/default/xui/zh/floater_tos.xml @@ -12,10 +12,9 @@ <text name="external_tos_required"> 你需先登入 https://my.secondlife.com 同意服務條款，才可繼續。 謝謝你！ </text> - <check_box label="我已閱畢並同意" name="agree_chk"/> <text name="agree_list"> - Second Life使用條款、隱私政策、服務條款，包括解決爭端的規定途徑。 - </text> + 我已閱畢並同意 Second Life使用條款、隱私政策、服務條款，包括解決爭端的規定途徑。 + </text> <button label="繼續" label_selected="繼續" name="Continue"/> <button label="取消" label_selected="取消" name="Cancel"/> </floater> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index fd565a8f16..d25192d7ba 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -2482,7 +2482,7 @@ SHA1 指紋：[MD5_DIGEST] <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> <notification name="ConfirmEmptyTrash"> - [COUNT]個物項將會永久刪除。 你確定你要永久刪除垃圾筒中的內容？ + [COUNT]個物項與資料夾將會永久刪除。 你確定你要永久刪除垃圾筒中的內容？ <usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/> </notification> <notification name="TrashIsFull"> @@ -3487,12 +3487,18 @@ SHA1 指紋：[MD5_DIGEST] <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="NoVoiceConnect"> - 試圖連接語音伺服器時出了問題： + 無法連通語音伺服器： [HOSTID] -將無法用語音溝通。 +必須允許語音的資料埠如下： +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + 請檢查你的網路和防火牆設定。 +關閉路由器中的SIP ALG(應用層閘道)功能。 + +將無法用語音溝通。 <usetemplate name="okbutton" yestext="確定"/> </notification> <notification name="AvatarRezLeftNotification"> diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml index 49553ecd18..1a28f4c3b5 100644 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="事物" name="main inventory panel"> <panel.string name="ItemcountFetching"> - 正在擷取 [ITEM_COUNT] 個物項… [FILTER] + 正在擷取[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾… [FILTER] </panel.string> <panel.string name="ItemcountCompleted"> - [ITEM_COUNT] 物品 [FILTER] + [ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER] </panel.string> <panel.string name="ItemcountUnknown"> - 已取得 [ITEM_COUNT] 物品 [FILTER] + 擷取了[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER] </panel.string> <text name="ItemcountText"> 物品： diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index 749d4c676c..f36f56bd53 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -276,7 +276,7 @@ http://secondlife.com/viewer-access-faq </string> <string name="LoginFailedPendingLogout"> 系統正在處理你的登出。 -你的帳號要等到 [TIME] （太平洋時間）才可使用。 +請稍待一分鐘再試圖重新登入。 </string> <string name="LoginFailedUnableToCreateSession"> 無法建立有效的時域。 @@ -1504,6 +1504,9 @@ http://secondlife.com/support 求助解決問題。 <string name="InventoryMarketplaceListingsNoItems"> 將資料夾拖曳到這個區域，即可在[[MARKETPLACE_DASHBOARD_URL] Marketplace]刊登出售。 </string> + <string name="InventoryItemsCount"> + （[ITEMS_COUNT]個物項） + </string> <string name="Marketplace Validation Warning Stock"> 限量資料夾必須放在版本資料夾裡 </string> |