diff options
27 files changed, 157 insertions, 82 deletions
| diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 113cbc276a..3c979c56c3 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/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/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/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/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/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/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..b9113e021a 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/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/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> | 
