Merge viewer-lynx

Sat, 07 Apr 2018 12:06:15 +0200

author
Ansariel
date
Sat, 07 Apr 2018 12:06:15 +0200
changeset 55364
f34afa48bc19
parent 55357
1f13ef305465
parent 55363
1e9828e37a4d
child 55365
866494c6b644

Merge viewer-lynx

indra/llui/llnotifications.h file | annotate | diff | revisions
indra/newview/llimprocessing.cpp file | annotate | diff | revisions
indra/newview/lltextureview.cpp file | annotate | diff | revisions
indra/newview/llviewerregion.cpp file | annotate | diff | revisions
indra/newview/llviewerregion.h file | annotate | diff | revisions
indra/newview/llvocache.h file | annotate | diff | revisions
indra/newview/skins/default/xui/de/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/fr/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/fr/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/fr/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pt/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pt/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/tr/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/tr/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/zh/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/zh/strings.xml file | annotate | diff | revisions
     1.1 --- a/indra/llui/llnotifications.h	Sat Apr 07 11:54:06 2018 +0200
     1.2 +++ b/indra/llui/llnotifications.h	Sat Apr 07 12:06:15 2018 +0200
     1.3 @@ -709,7 +709,7 @@
     1.4  {
     1.5  	struct orderByUUID
     1.6  	{
     1.7 -		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
     1.8 +		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) const
     1.9  		{
    1.10  			return lhs->id() < rhs->id();
    1.11  		}
     2.1 --- a/indra/newview/lltextureview.cpp	Sat Apr 07 11:54:06 2018 +0200
     2.2 +++ b/indra/newview/lltextureview.cpp	Sat Apr 07 12:06:15 2018 +0200
     2.3 @@ -845,7 +845,7 @@
     2.4  typedef std::pair<F32,LLViewerFetchedTexture*> decode_pair_t;
     2.5  struct compare_decode_pair
     2.6  {
     2.7 -	bool operator()(const decode_pair_t& a, const decode_pair_t& b)
     2.8 +	bool operator()(const decode_pair_t& a, const decode_pair_t& b) const
     2.9  	{
    2.10  		return a.first > b.first;
    2.11  	}
     3.1 --- a/indra/newview/llviewerregion.h	Sat Apr 07 11:54:06 2018 +0200
     3.2 +++ b/indra/newview/llviewerregion.h	Sat Apr 07 12:06:15 2018 +0200
     3.3 @@ -468,7 +468,7 @@
     3.4  
     3.5  	struct CompareRegionByLastUpdate
     3.6  	{
     3.7 -		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs)
     3.8 +		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) const
     3.9  		{
    3.10  			S32 lpa = lhs->getLastUpdate();
    3.11  			S32 rpa = rhs->getLastUpdate();
     4.1 --- a/indra/newview/llvocache.h	Sat Apr 07 11:54:06 2018 +0200
     4.2 +++ b/indra/newview/llvocache.h	Sat Apr 07 12:06:15 2018 +0200
     4.3 @@ -59,7 +59,7 @@
     4.4  
     4.5  	struct CompareVOCacheEntry
     4.6  	{
     4.7 -		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs)
     4.8 +		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) const
     4.9  		{
    4.10  			F32 lpa = lhs->getSceneContribution();
    4.11  			F32 rpa = rhs->getSceneContribution();
     5.1 --- a/indra/newview/skins/default/xui/de/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
     5.2 +++ b/indra/newview/skins/default/xui/de/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
     5.3 @@ -2593,7 +2593,7 @@
     5.4  		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
     5.5  	</notification>
     5.6  	<notification name="ConfirmEmptyTrash">
     5.7 -		[COUNT] Objekte und Ordner werden dauerhaft gelöscht. Möchten Sie den Inhalt Ihres Papierkorbs wirklich dauerhaft löschen?
     5.8 +		[COUNT] Objekte und Ordner werden dauerhaft gelöscht. Sind Sie sicher, dass Sie den Inhalt Ihres Papierkorbs dauerhaft löschen möchten?
     5.9  		<usetemplate ignoretext="Bestätigen, bevor der Ordner Papierkorb im Inventar geleert wird" name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
    5.10  	</notification>
    5.11  	<notification name="TrashIsFull">
    5.12 @@ -3684,7 +3684,7 @@
    5.13  		<usetemplate name="okbutton" yestext="OK"/>
    5.14  	</notification>
    5.15  	<notification name="NoVoiceConnect">
    5.16 -		Verbindung mit Voice-Server ist leider nicht möglich:
    5.17 +		Wir können uns nicht mit dem Voice-Server verbinden: 
    5.18  
    5.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
    5.20  
     6.1 --- a/indra/newview/skins/default/xui/de/strings.xml	Sat Apr 07 11:54:06 2018 +0200
     6.2 +++ b/indra/newview/skins/default/xui/de/strings.xml	Sat Apr 07 12:06:15 2018 +0200
     6.3 @@ -288,8 +288,8 @@
     6.4  		Abmeldeanforderung führte zu einem Simulatorfehler.
     6.5  	</string>
     6.6  	<string name="LoginFailedPendingLogout">
     6.7 -		Das System meldet Sie gerade ab.
     6.8 -Bitte warten Sie eine Minute, bevor Sie erneut versuchen sich anzumelden.
     6.9 +		Das System meldet Sie gerade ab. 
    6.10 +Bitte warten Sie eine Minute, bevor Sie sich erneut einloggen.
    6.11  	</string>
    6.12  	<string name="LoginFailedUnableToCreateSession">
    6.13  		Es kann keine gültige Sitzung erstellt werden.
     7.1 --- a/indra/newview/skins/default/xui/es/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
     7.2 +++ b/indra/newview/skins/default/xui/es/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
     7.3 @@ -2518,7 +2518,7 @@
     7.4  		<usetemplate ignoretext="Confirmar antes de borrar una carpeta del sistema" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
     7.5  	</notification>
     7.6  	<notification name="ConfirmEmptyTrash">
     7.7 -		¿Estás seguro de que quieres borrar de forma permanente el contenido de la Papelera?
     7.8 +		[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?
     7.9  		<usetemplate ignoretext="Confirmar antes de vaciar la Papelera del inventario" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
    7.10  	</notification>
    7.11  	<notification name="TrashIsFull">
    7.12 @@ -3672,12 +3672,18 @@
    7.13  		<usetemplate name="okbutton" yestext="Aceptar"/>
    7.14  	</notification>
    7.15  	<notification name="NoVoiceConnect">
    7.16 -		Tenemos problemas de conexión con tu servidor de voz:
    7.17 +		No se pudo establecer una conexión con el servidor de voz: 
    7.18  
    7.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
    7.20  
    7.21 +Los puertos que deben estar activos para el servicio de voz son: 
    7.22 +:TCP:  80, 443 
    7.23 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 
    7.24 +
    7.25 +Comprueba la configuración de la red y del servidor de seguridad. 
    7.26 +Desactiva las funciones SIP ALG de tu router. 
    7.27 +
    7.28  No podrás establecer comunicaciones de voz.
    7.29 -Comprueba la configuración de la red y del servidor de seguridad.
    7.30  		<usetemplate ignoretext="Avísame cuando el visor no pueda conectar al servidor de voz" name="okignore" yestext="Aceptar"/>
    7.31  	</notification>
    7.32  	<notification name="AvatarRezLeftNotification">
     8.1 --- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml	Sat Apr 07 11:54:06 2018 +0200
     8.2 +++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml	Sat Apr 07 12:06:15 2018 +0200
     8.3 @@ -1,10 +1,10 @@
     8.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     8.5  <panel label="Cosas" name="main inventory panel">
     8.6  	<panel.string name="ItemcountFetching">
     8.7 -		Obtenidos [ITEM_COUNT] items... [FILTER]
     8.8 +		Obteniendo [ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas... [FILTER]
     8.9  	</panel.string>
    8.10  	<panel.string name="ItemcountCompleted">
    8.11 -		[ITEM_COUNT] items [FILTER]
    8.12 +		[ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas [FILTER]
    8.13  	</panel.string>
    8.14  	<filter_editor label="Filtrar" name="inventory search editor" tool_tip="Escribe uno o más términos a buscar, separados por '+' "/>
    8.15  	<button name="collapse_btn" label="Contraer"/>
     9.1 --- a/indra/newview/skins/default/xui/es/strings.xml	Sat Apr 07 11:54:06 2018 +0200
     9.2 +++ b/indra/newview/skins/default/xui/es/strings.xml	Sat Apr 07 12:06:15 2018 +0200
     9.3 @@ -258,9 +258,8 @@
     9.4  		La solicitud de cierre de sesión ha obtenido como resultado un error del simulador.
     9.5  	</string>
     9.6  	<string name="LoginFailedPendingLogout">
     9.7 -		El sistema está cerrando tu sesión en estos momentos.
     9.8 -Tu cuenta no estará disponible hasta las
     9.9 -[TIME] (horario de la costa del Pacífico de EEUU).
    9.10 +		El sistema te desconectará. 
    9.11 +Por favor, aguarda un momento antes de intentar conectarte nuevamente.
    9.12  	</string>
    9.13  	<string name="LoginFailedUnableToCreateSession">
    9.14  		No se ha podido crear una sesión válida.
    9.15 @@ -1544,6 +1543,9 @@
    9.16  	<string name="InventoryMarketplaceListingsNoItems">
    9.17  		Arrastra carpetas a esta sección para incluirlas en la lista de venta del [[MARKETPLACE_DASHBOARD_URL] Mercado].
    9.18  	</string>
    9.19 +	<string name="InventoryItemsCount">
    9.20 +		( [ITEMS_COUNT] Objetos)
    9.21 +	</string>
    9.22  	<string name="Marketplace Validation Warning Stock">
    9.23  		La carpeta de stock debe estar contenida en una carpeta de versión
    9.24  	</string>
    10.1 --- a/indra/newview/skins/default/xui/fr/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    10.2 +++ b/indra/newview/skins/default/xui/fr/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    10.3 @@ -2431,7 +2431,7 @@
    10.4  		<usetemplate ignoretext="Confirmer avant la suppression d&apos;un dossier système" name="okcancelignore" notext="Annuler" yestext="OK"/>
    10.5  	</notification>
    10.6  	<notification name="ConfirmEmptyTrash">
    10.7 -		Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente ?
    10.8 +		[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 ?
    10.9  		<usetemplate ignoretext="Confirmer avant de vider la corbeille" name="okcancelignore" notext="Annuler" yestext="OK"/>
   10.10  	</notification>
   10.11  	<notification name="TrashIsFull">
   10.12 @@ -3471,12 +3471,18 @@
   10.13  		<usetemplate name="okbutton" yestext="OK"/>
   10.14  	</notification>
   10.15  	<notification name="NoVoiceConnect">
   10.16 -		Problèmes de connexion à votre serveur vocal :
   10.17 +		La connexion au serveur vocal est impossible : 
   10.18  
   10.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   10.20  
   10.21 +Les ports autorisés pour la voix sont :
   10.22 +:TCP: 80, 443
   10.23 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
   10.24 +
   10.25 +Veuillez vérifier la configuration de votre réseau et de votre pare-feu. 
   10.26 +Veuillez désactiver toute  fonctionnalité SIP ALG dans votre routeur. 
   10.27 +
   10.28  Aucune communication vocale n&apos;est disponible.
   10.29 -Veuillez vérifier la configuration de votre réseau et de votre pare-feu.
   10.30  		<usetemplate name="okbutton" yestext="OK"/>
   10.31  	</notification>
   10.32  	<notification name="AvatarRezLeftNotification">
    11.1 --- a/indra/newview/skins/default/xui/fr/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    11.2 +++ b/indra/newview/skins/default/xui/fr/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    11.3 @@ -255,9 +255,8 @@
    11.4  		Le simulateur a renvoyé une erreur en réponse à la demande de déconnexion.
    11.5  	</string>
    11.6  	<string name="LoginFailedPendingLogout">
    11.7 -		Le système est en train de vous déconnecter.
    11.8 -Votre compte sera indisponible jusqu&apos;à
    11.9 -[TIME], heure du Pacifique.
   11.10 +		Le système est en train de vous déconnecter. 
   11.11 +Veuillez réessayer de vous connecter dans une minute.
   11.12  	</string>
   11.13  	<string name="LoginFailedUnableToCreateSession">
   11.14  		Impossible de créer de session valide.
   11.15 @@ -1494,6 +1493,9 @@
   11.16  	<string name="InventoryMarketplaceListingsNoItems">
   11.17  		Pour mettre des dossiers en vente sur la [[MARKETPLACE_DASHBOARD_URL] Place du marché], faites-les glisser vers cette zone.
   11.18  	</string>
   11.19 +	<string name="InventoryItemsCount">
   11.20 +		( [ITEMS_COUNT] Articles )
   11.21 +	</string>
   11.22  	<string name="Marketplace Validation Warning Stock">
   11.23  		le dossier de stock doit être contenu dans un dossier de version
   11.24  	</string>
    12.1 --- a/indra/newview/skins/default/xui/it/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    12.2 +++ b/indra/newview/skins/default/xui/it/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    12.3 @@ -2395,7 +2395,7 @@
    12.4  		<usetemplate ignoretext="Chiedi conferma prima di eliminare una cartella di sistema" name="okcancelignore" notext="Annulla" yestext="OK"/>
    12.5  	</notification>
    12.6  	<notification name="ConfirmEmptyTrash">
    12.7 -		Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino?
    12.8 +		[COUNT] oggetti e cartelle verranno eliminati definitivamente. Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino?
    12.9  		<usetemplate ignoretext="Conferma prima di svuotare la cartella del Cestino inventario" name="okcancelignore" notext="Annulla" yestext="OK"/>
   12.10  	</notification>
   12.11  	<notification name="TrashIsFull">
   12.12 @@ -3435,12 +3435,18 @@
   12.13  		<usetemplate name="okbutton" yestext="OK"/>
   12.14  	</notification>
   12.15  	<notification name="NoVoiceConnect">
   12.16 -		A causa di problemi di connessione al server vocale
   12.17 +		Non riusciamo a collegarci al server voce:
   12.18  
   12.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   12.20  
   12.21 -le comunicazioni tramite voce non saranno disponibili.
   12.22 -Ti consigliamo di controllare le tue impostazioni di rete e della firewall.
   12.23 +porte che devono avere il permesso voce sono: 
   12.24 +:TCP: 80, 443
   12.25 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
   12.26 +
   12.27 +Controlla le tue impostazione di rete e della firewall. 
   12.28 +Disabilita la funzione SIP ALG del router. 
   12.29 +
   12.30 +La comunicazione voce non sará possibile.
   12.31  		<usetemplate name="okbutton" yestext="OK"/>
   12.32  	</notification>
   12.33  	<notification name="AvatarRezLeftNotification">
    13.1 --- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml	Sat Apr 07 11:54:06 2018 +0200
    13.2 +++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml	Sat Apr 07 12:06:15 2018 +0200
    13.3 @@ -1,13 +1,13 @@
    13.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    13.5  <panel label="Cose" name="main inventory panel">
    13.6  	<panel.string name="ItemcountFetching">
    13.7 -		Recupero di [ITEM_COUNT] oggetti... [FILTER]
    13.8 +		Recupero di [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle... [FILTER]
    13.9  	</panel.string>
   13.10  	<panel.string name="ItemcountCompleted">
   13.11 -		[ITEM_COUNT] oggetti [FILTER]
   13.12 +		[ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER]
   13.13  	</panel.string>
   13.14  	<panel.string name="ItemcountUnknown">
   13.15 -		Recuperati [ITEM_COUNT] elementi [FILTER]
   13.16 +		Recuperati [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER]
   13.17  	</panel.string>
   13.18  	<text name="ItemcountText">
   13.19  		Oggetti:
    14.1 --- a/indra/newview/skins/default/xui/it/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    14.2 +++ b/indra/newview/skins/default/xui/it/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    14.3 @@ -251,9 +251,8 @@
    14.4  		Errore del simulatore in seguito alla richiesta di logout.
    14.5  	</string>
    14.6  	<string name="LoginFailedPendingLogout">
    14.7 -		Il sistema sta eseguendo il logout in questo momento.
    14.8 -Il tuo account non sarà disponibile fino alle
    14.9 -[TIME] fuso orario del Pacifico.
   14.10 +		Il sistema sta eseguendo il logout in questo momento. 
   14.11 +Prova ad accedere nuovamente tra un minuto.
   14.12  	</string>
   14.13  	<string name="LoginFailedUnableToCreateSession">
   14.14  		Non è possibile creare una sessione valida.
   14.15 @@ -1480,6 +1479,9 @@
   14.16  	<string name="InventoryMarketplaceListingsNoItems">
   14.17  		Trascina le cartelle in questa area per metterle in vendita su [[MARKETPLACE_DASHBOARD_URL] Marketplace].
   14.18  	</string>
   14.19 +	<string name="InventoryItemsCount">
   14.20 +		( [ITEM_COUNT] oggetti )
   14.21 +	</string>
   14.22  	<string name="Marketplace Validation Warning Stock">
   14.23  		la cartella di magazzino deve essere inclusa in una cartella di versione
   14.24  	</string>
    15.1 --- a/indra/newview/skins/default/xui/ja/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    15.2 +++ b/indra/newview/skins/default/xui/ja/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    15.3 @@ -2686,7 +2686,7 @@
    15.4  		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
    15.5  	</notification>
    15.6  	<notification name="ConfirmEmptyTrash">
    15.7 -		[COUNT] 個のアイテムが完全に削除されます。本当にごみ箱の中身をすべて削除しますか?
    15.8 +		[COUNT] 個のアイテムとフォルダーが完全に削除されます。ごみ箱の項目をすべて削除しますか?
    15.9  		<usetemplate ignoretext="インベントリのごみ箱フォルダを空にする前の確認" name="okcancelbuttons" notext="取り消し" yestext="OK"/>
   15.10  	</notification>
   15.11  	<notification name="TrashIsFull">
   15.12 @@ -3895,12 +3895,18 @@
   15.13  		<usetemplate name="okbutton" yestext="OK"/>
   15.14  	</notification>
   15.15  	<notification name="NoVoiceConnect">
   15.16 -		ボイスサーバーに接続できません:
   15.17 +		ボイスサーバーに接続できません: 音声に許可される必要のある 
   15.18  
   15.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   15.20  
   15.21 +ポート: 
   15.22 +:TCP:80, 443 
   15.23 +:UDP:3478, 3479, 5060, 5062, 6250, 12000-32000
   15.24 +
   15.25 +お使いのネットワークやファイアウォールの設定を確認してください。
   15.26 +お使いのルーターの SIP ALG 機能をすべて無効にしてください。
   15.27 +
   15.28  ボイスチャットによるコミュニケーションが利用できません。
   15.29 -お使いのネットワークやファイアウォールの設定を確認してください。
   15.30  		<usetemplate name="okbutton" yestext="OK"/>
   15.31  	</notification>
   15.32  	<notification name="AvatarRezLeftNotification">
    16.1 --- a/indra/newview/skins/default/xui/ja/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    16.2 +++ b/indra/newview/skins/default/xui/ja/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    16.3 @@ -213,8 +213,7 @@
    16.4  	</string>
    16.5  	<string name="LoginFailedPendingLogout">
    16.6  		システムによるログアウトが実行されました。
    16.7 -あなたのアカウントは
    16.8 -太平洋時間の [TIME] までご利用いただけません。
    16.9 +しばらくしてから再度お試しください。
   16.10  	</string>
   16.11  	<string name="LoginFailedUnableToCreateSession">
   16.12  		有効なセッションを生成できません。
   16.13 @@ -1479,6 +1478,9 @@
   16.14  	<string name="InventoryMarketplaceListingsNoItems">
   16.15  		[[MARKETPLACE_DASHBOARD_URL] マーケットプレイス]に販売するアイテムを一覧するには、フォルダをこのエリアにドラッグします。
   16.16  	</string>
   16.17 +	<string name="InventoryItemsCount">
   16.18 +		([ITEMS_COUNT] 個のアイテム)
   16.19 +	</string>
   16.20  	<string name="Marketplace Validation Warning Stock">
   16.21  		バージョンフォルダに在庫フォルダが含まれなければなりません
   16.22  	</string>
    17.1 --- a/indra/newview/skins/default/xui/pt/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    17.2 +++ b/indra/newview/skins/default/xui/pt/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    17.3 @@ -2383,7 +2383,7 @@
    17.4  		<usetemplate ignoretext="Confirmar antes de excluir pastas do sistema." name="okcancelignore" notext="Cancelar" yestext="OK"/>
    17.5  	</notification>
    17.6  	<notification name="ConfirmEmptyTrash">
    17.7 -		Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre?
    17.8 +		[COUNT] itens e pastas serão excluídas permanentemente. Tem certeza de que deseja excluir o conteúdo da Lixeira? Para sempre?
    17.9  		<usetemplate ignoretext="Confirmar antes de esvaziar a pasta Lixeira" name="okcancelignore" notext="Não" yestext="Sim"/>
   17.10  	</notification>
   17.11  	<notification name="TrashIsFull">
   17.12 @@ -3420,12 +3420,18 @@
   17.13  		<usetemplate name="okbutton" yestext="OK"/>
   17.14  	</notification>
   17.15  	<notification name="NoVoiceConnect">
   17.16 -		Estamos tendo problemas de conexão com o seu servidor de voz:
   17.17 +		Não conseguimos conectar ao servidor de voz:
   17.18  
   17.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   17.20  
   17.21 +As portas que devem ter permissão para voz são: 
   17.22 +:TCP: 80, 443
   17.23 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
   17.24 +
   17.25 +Verifique a configuração da sua rede e firewall. 
   17.26 +Desativar qualquer configuração SIP ALG em seu router. 
   17.27 +
   17.28  Talvez não seja possível se comunicar via voz.
   17.29 -Verifique a configuração da sua rede e firewall.
   17.30  		<usetemplate name="okbutton" yestext="OK"/>
   17.31  	</notification>
   17.32  	<notification name="AvatarRezLeftNotification">
    18.1 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml	Sat Apr 07 11:54:06 2018 +0200
    18.2 +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml	Sat Apr 07 12:06:15 2018 +0200
    18.3 @@ -1,13 +1,13 @@
    18.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    18.5  <panel label="Coisas" name="main inventory panel">
    18.6  	<panel.string name="ItemcountFetching">
    18.7 -		Reunindo [ITEM_COUNT] itens ... [FILTER]
    18.8 +		Reunir [ITEM_COUNT] Itens e [CATEGORY_COUNT] Pastas... [FILTER]
    18.9  	</panel.string>
   18.10  	<panel.string name="ItemcountCompleted">
   18.11 -		[ITEM_COUNT] itens [FILTER]
   18.12 +		[ITEM_COUNT] Itens e [CATEGORY_COUNT] Pastas [FILTER]
   18.13  	</panel.string>
   18.14  	<panel.string name="ItemcountUnknown">
   18.15 -		Recuperados [ITEM_COUNT] itens [FILTER]
   18.16 +		Itens [ITEM_COUNT] e Pastas [CATEGORY_COUNT] Reunidos [FILTER]
   18.17  	</panel.string>
   18.18  	<text name="ItemcountText">
   18.19  		Itens:
    19.1 --- a/indra/newview/skins/default/xui/pt/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    19.2 +++ b/indra/newview/skins/default/xui/pt/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    19.3 @@ -230,7 +230,8 @@
    19.4  		Reação à solicitação de saída foi uma falha do simulador.
    19.5  	</string>
    19.6  	<string name="LoginFailedPendingLogout">
    19.7 -		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).
    19.8 +		O sistema o está desconectando no momento. 
    19.9 +Aguarde um minuto antes que tentar logar-se novamente.
   19.10  	</string>
   19.11  	<string name="LoginFailedUnableToCreateSession">
   19.12  		Impossível criar sessão válida.
   19.13 @@ -1443,6 +1444,9 @@
   19.14  	<string name="InventoryMarketplaceListingsNoItems">
   19.15  		Arraste pastas para esta área para listá-las para venda no [Marketplace [MARKETPLACE_DASHBOARD_URL]].
   19.16  	</string>
   19.17 +	<string name="InventoryItemsCount">
   19.18 +		( [ITEMS_COUNT] Items )
   19.19 +	</string>
   19.20  	<string name="Marketplace Validation Warning Stock">
   19.21  		a pasta de estoque deve estar em uma pasta de versões
   19.22  	</string>
    20.1 --- a/indra/newview/skins/default/xui/ru/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    20.2 +++ b/indra/newview/skins/default/xui/ru/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    20.3 @@ -2481,7 +2481,7 @@
    20.4  		<usetemplate ignoretext="Подтверждать перед удалением системной папки" name="okcancelignore" notext="Отмена" yestext="OK"/>
    20.5  	</notification>
    20.6  	<notification name="ConfirmEmptyTrash">
    20.7 -		Вы действительно хотите необратимо удалить содержимое корзины?
    20.8 +		[COUNT] предметов(а) и папки будут окончательно удалены. Вы действительно хотите удалить содержимое корзины без возможности восстановления?
    20.9  		<usetemplate ignoretext="Подтверждать перед опорожнением корзины инвентаря" name="okcancelignore" notext="Отмена" yestext="OK"/>
   20.10  	</notification>
   20.11  	<notification name="TrashIsFull">
   20.12 @@ -3647,7 +3647,7 @@
   20.13  		<usetemplate name="okbutton" yestext="OK"/>
   20.14  	</notification>
   20.15  	<notification name="NoVoiceConnect">
   20.16 -		Возникли проблемы соединения с голосовым сервером:
   20.17 +		Нет связи с речевым сервером: порты 
   20.18  
   20.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   20.20  
    21.1 --- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml	Sat Apr 07 11:54:06 2018 +0200
    21.2 +++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml	Sat Apr 07 12:06:15 2018 +0200
    21.3 @@ -1,13 +1,13 @@
    21.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    21.5  <panel label="Вещи" name="main inventory panel">
    21.6  	<panel.string name="ItemcountFetching">
    21.7 -		Обнаружено [ITEM_COUNT] элементов... [FILTER]
    21.8 +		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок ... [FILTER]
    21.9  	</panel.string>
   21.10  	<panel.string name="ItemcountCompleted">
   21.11 -		[ITEM_COUNT] Элементов [FILTER]
   21.12 +		[ITEM_COUNT] предметов(а) и [CATEGORY_COUNT] папки(ок) ... [FILTER]
   21.13  	</panel.string>
   21.14  	<panel.string name="ItemcountUnknown">
   21.15 -		Извлечено [ITEM_COUNT] вещей [FILTER]
   21.16 +		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER]
   21.17  	</panel.string>
   21.18  	<text name="ItemcountText">
   21.19  		Объекты:
    22.1 --- a/indra/newview/skins/default/xui/ru/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    22.2 +++ b/indra/newview/skins/default/xui/ru/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    22.3 @@ -283,9 +283,8 @@
    22.4  		В ответ на запрос выхода, симулятор вернул сообщение о сбое.
    22.5  	</string>
    22.6  	<string name="LoginFailedPendingLogout">
    22.7 -		В системе выполняется выход для вашего аккаунта.
    22.8 -Он будет недоступна до
    22.9 -[TIME] по тихоокеанскому времени.
   22.10 +		В системе выполняется выход для вашего аккаунта. 
   22.11 +Подождите минуту перед повторным входом в систему.
   22.12  	</string>
   22.13  	<string name="LoginFailedUnableToCreateSession">
   22.14  		Не удается создать допустимый сеанс.
   22.15 @@ -1659,6 +1658,9 @@
   22.16  	<string name="InventoryMarketplaceListingsNoItems">
   22.17  		Перетащите папки в эту область, чтобы выставить их на продажу в [[MARKETPLACE_DASHBOARD_URL] Торговом центре].
   22.18  	</string>
   22.19 +	<string name="InventoryItemsCount">
   22.20 +		( [ITEMS_COUNT] предметов(а))
   22.21 +	</string>
   22.22  	<string name="Marketplace Validation Warning Stock">
   22.23  		В папке версии должна быть папка запасов
   22.24  	</string>
    23.1 --- a/indra/newview/skins/default/xui/tr/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    23.2 +++ b/indra/newview/skins/default/xui/tr/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    23.3 @@ -2491,7 +2491,7 @@
    23.4  		<usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/>
    23.5  	</notification>
    23.6  	<notification name="ConfirmEmptyTrash">
    23.7 -		[COUNT] öğe kalıcı olarak silinecektir. Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinize emin misiniz?
    23.8 +		[COUNT] öğe ve klasör kalıcı olarak silinecektir. Çöp kutunuzun içeriğini kalıcı olarak silmek istediğinizden emin misiniz?
    23.9  		<usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tamam"/>
   23.10  	</notification>
   23.11  	<notification name="TrashIsFull">
   23.12 @@ -3548,12 +3548,18 @@
   23.13  		<usetemplate name="okbutton" yestext="Tamam"/>
   23.14  	</notification>
   23.15  	<notification name="NoVoiceConnect">
   23.16 -		Ses sunucunuz ile bağlantı kurma konusunda sorun yaşıyoruz.
   23.17 +		Ses sunucusuna bağlanamıyoruz: Ses için izin verilmesi gereken 
   23.18  
   23.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   23.20  
   23.21 -Ses bağlantıları kullanılamayacak.
   23.22 -Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin.
   23.23 +Portları:
   23.24 +:TCP: 80, 443
   23.25 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
   23.26 +
   23.27 +Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin. 
   23.28 +Yönlendiricinizdeki her SIP ALG özelliğini devre dışı bırakın. 
   23.29 +
   23.30 +Sesli iletişim kullanılamayacak.
   23.31  		<usetemplate name="okbutton" yestext="Tamam"/>
   23.32  	</notification>
   23.33  	<notification name="AvatarRezLeftNotification">
    24.1 --- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml	Sat Apr 07 11:54:06 2018 +0200
    24.2 +++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml	Sat Apr 07 12:06:15 2018 +0200
    24.3 @@ -1,13 +1,13 @@
    24.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    24.5  <panel label="Eşyalar" name="main inventory panel">
    24.6  	<panel.string name="ItemcountFetching">
    24.7 -		[ITEM_COUNT] Öge Alınıyor... [FILTER]
    24.8 +		[ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alınıyor... [FILTER]
    24.9  	</panel.string>
   24.10  	<panel.string name="ItemcountCompleted">
   24.11 -		[ITEM_COUNT] Öge [FILTER]
   24.12 +		[ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör [FILTER]
   24.13  	</panel.string>
   24.14  	<panel.string name="ItemcountUnknown">
   24.15 -		Alınan [ITEM_COUNT] Öğe [FILTER]
   24.16 +		[ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alındı [FILTER]
   24.17  	</panel.string>
   24.18  	<text name="ItemcountText">
   24.19  		Ögeler:
    25.1 --- a/indra/newview/skins/default/xui/tr/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    25.2 +++ b/indra/newview/skins/default/xui/tr/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    25.3 @@ -270,9 +270,8 @@
    25.4  		Oturum kapatma talebi simülatörden bir hata yanıtı gelmesine neden oldu.
    25.5  	</string>
    25.6  	<string name="LoginFailedPendingLogout">
    25.7 -		Sistem şu anda oturumunuzu sonlandırıyor.
    25.8 -Hesabınıza şu zamana kadar erişemeyeceksiniz:
    25.9 -Pasifik Saati ile [TIME].
   25.10 +		Sistem şu anda oturumunuzu kapatıyor. 
   25.11 +Lütfen yeniden oturum açmayı denemeden önce bir dakika bekleyin.
   25.12  	</string>
   25.13  	<string name="LoginFailedUnableToCreateSession">
   25.14  		Geçerli bir oturum oluşturulamadı.
   25.15 @@ -1501,6 +1500,9 @@
   25.16  	<string name="InventoryMarketplaceListingsNoItems">
   25.17  		Klasörleri [[MARKETPLACE_DASHBOARD_URL] Pazaryerinde] satılık olarak listelemek için bu alana sürükleyin.
   25.18  	</string>
   25.19 +	<string name="InventoryItemsCount">
   25.20 +		( [ITEMS_COUNT] Öğe )
   25.21 +	</string>
   25.22  	<string name="Marketplace Validation Warning Stock">
   25.23  		stok klasörü bir sürüm klasöründe bulunmalıdır
   25.24  	</string>
    26.1 --- a/indra/newview/skins/default/xui/zh/notifications.xml	Sat Apr 07 11:54:06 2018 +0200
    26.2 +++ b/indra/newview/skins/default/xui/zh/notifications.xml	Sat Apr 07 12:06:15 2018 +0200
    26.3 @@ -2380,7 +2380,7 @@
    26.4  		<usetemplate ignoretext="在我刪除系統資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
    26.5  	</notification>
    26.6  	<notification name="ConfirmEmptyTrash">
    26.7 -		你確定你要對你垃圾筒中的內容進行刪除?
    26.8 +		[COUNT]個物項與資料夾將會永久刪除。 你確定你要永久刪除垃圾筒中的內容?
    26.9  		<usetemplate ignoretext="在我清空收納區垃圾筒資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
   26.10  	</notification>
   26.11  	<notification name="TrashIsFull">
   26.12 @@ -3420,12 +3420,18 @@
   26.13  		<usetemplate name="okbutton" yestext="確定"/>
   26.14  	</notification>
   26.15  	<notification name="NoVoiceConnect">
   26.16 -		試圖連接語音伺服器時出了問題:
   26.17 +		無法連通語音伺服器:
   26.18  
   26.19  &lt;nolink&gt;[HOSTID]&lt;/nolink&gt;
   26.20  
   26.21 +必須允許語音的資料埠如下:
   26.22 +:TCP: 80, 443
   26.23 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
   26.24 +
   26.25 +請檢查你的網路和防火牆設定。
   26.26 +關閉路由器中的SIP ALG(應用層閘道)功能。
   26.27 +
   26.28  將無法用語音溝通。
   26.29 -請檢查你的網路和防火牆設定。
   26.30  		<usetemplate name="okbutton" yestext="確定"/>
   26.31  	</notification>
   26.32  	<notification name="AvatarRezLeftNotification">
    27.1 --- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml	Sat Apr 07 11:54:06 2018 +0200
    27.2 +++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml	Sat Apr 07 12:06:15 2018 +0200
    27.3 @@ -1,13 +1,13 @@
    27.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    27.5  <panel label="事物" name="main inventory panel">
    27.6  	<panel.string name="ItemcountFetching">
    27.7 -		正在擷取 [ITEM_COUNT] 個物項… [FILTER]
    27.8 +		正在擷取[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾… [FILTER]
    27.9  	</panel.string>
   27.10  	<panel.string name="ItemcountCompleted">
   27.11 -		[ITEM_COUNT] 物品 [FILTER]
   27.12 +		[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER]
   27.13  	</panel.string>
   27.14  	<panel.string name="ItemcountUnknown">
   27.15 -		已取得 [ITEM_COUNT] 物品 [FILTER]
   27.16 +		擷取了[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER]
   27.17  	</panel.string>
   27.18  	<text name="ItemcountText">
   27.19  		物品:
    28.1 --- a/indra/newview/skins/default/xui/zh/strings.xml	Sat Apr 07 11:54:06 2018 +0200
    28.2 +++ b/indra/newview/skins/default/xui/zh/strings.xml	Sat Apr 07 12:06:15 2018 +0200
    28.3 @@ -261,7 +261,7 @@
    28.4  	</string>
    28.5  	<string name="LoginFailedPendingLogout">
    28.6  		系統正在處理你的登出。
    28.7 -你的帳號要等到 [TIME] (太平洋時間)才可使用。
    28.8 +請稍待一分鐘再試圖重新登入。
    28.9  	</string>
   28.10  	<string name="LoginFailedUnableToCreateSession">
   28.11  		無法建立有效的時域。
   28.12 @@ -1482,6 +1482,9 @@
   28.13  	<string name="InventoryMarketplaceListingsNoItems">
   28.14  		將資料夾拖曳到這個區域,即可在[[MARKETPLACE_DASHBOARD_URL] Marketplace]刊登出售。
   28.15  	</string>
   28.16 +	<string name="InventoryItemsCount">
   28.17 +		([ITEMS_COUNT]個物項)
   28.18 +	</string>
   28.19  	<string name="Marketplace Validation Warning Stock">
   28.20  		限量資料夾必須放在版本資料夾裡
   28.21  	</string>

mercurial