diff options
24 files changed, 446 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml index f4a9acddec..993316134a 100755 --- a/indra/newview/skins/default/xui/de/floater_stats.xml +++ b/indra/newview/skins/default/xui/de/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="Darstellung" name="render"> <stat_bar label="KTris pro Frame" name="ktrisframe"/> <stat_bar label="KTris pro Sekunden" name="ktrissec"/> - <stat_bar label="Objektanzahl" name="objs"/> + <stat_bar label="Objekte gesamt" name="totalobjs"/> + <stat_bar label="Zwischengespeicherte Objekte" name="cachedobjs"/> <stat_bar label="Neue Objekte" name="newobjs"/> <stat_bar label="Objektcache-Trefferrate" name="object_cache_hits"/> <stat_bar label="Durchgeführte Okklusionsabfragen" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index c728402e89..2fa5005d15 100755 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -216,6 +216,22 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen? Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen? <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> </notification> + <notification name="AssignBanAbilityWarning"> + Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zuzuweisen. + + *ACHTUNG* +Jedem Mitglied in einer Rolle mit dieser Fähigkeit werden auch die Fähigkeiten „[ACTION_NAME_2]“ und „[ACTION_NAME_3]“ zugewiesen. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + Sie sind im Begriff, die Fähigkeit „[ACTION_NAME]“ aus der Rolle „[ROLE_NAME]“ zu entfernen. + + *ACHTUNG* +Durch Entfernen dieser Fähigkeit werden die Fähigkeiten „[ACTION_NAME_2]“ und „[ACTION_NAME_3]“ NICHT entfernt. + +Wenn diese Rolle nicht mehr diese Fähigkeiten haben soll, deaktivieren Sie sie bitte umgehend. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> Sie sind dabei, [AVATAR_NAME] aus der Gruppe hinauszuwerfen. <usetemplate ignoretext="Hinauswerfen eines einzelnen Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/> @@ -1591,6 +1607,14 @@ Diese Gruppe verlassen? Sie können die Gruppe nicht verlassen, da Sie der letzte Besitzer der Gruppe sind. Weisen Sie die Besitzerrolle zuerst einem anderen Mitglied zu. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + Kann Gruppe nicht verlassen: [reason]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + Sie haben die Gruppe „[group_name]“ verlassen. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/> @@ -2474,6 +2498,12 @@ Wählen Sie eine kleinere Landfläche. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4050,6 +4080,10 @@ Wählen Sie eine kleinere Landfläche aus. Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt. <usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + Die Standardberechtigungen konnten aus folgendem Grund nicht gespeichert werden: [REASON]. Versuchen Sie später, die Standardberechtigungen einzustellen. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> Chatverlaufsdatei ist noch mit vorheriger Operation beschäftigt. Versuchen Sie es in ein paar Minuten noch einmal oder chatten Sie mit einer anderen Person. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index f67ebbf7b9..7ac6708321 100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml @@ -11,8 +11,7 @@ <check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/> <check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/> <check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/> - <check_box label="Meine Lieblingslandmarken bei Anmeldung anzeigen (im Dropdown-Menü -„Hier anfangen“)" name="favorites_on_login_check" top_pad="15"/> + <check_box label="Meine Lieblingslandmarken bei Anmeldung anzeigen (im Dropdown-Menü „Hier anfangen“)" name="favorites_on_login_check" top_pad="15"/> <text name="Logs:"> Chatprotokolle: </text> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 95657ba14e..d4ce7b3fc3 100755 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -335,6 +335,75 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="TestingDisconnect"> Verbindungsabbruch wird getestet </string> + <string name="SocialFlickrConnecting"> + Verbinden mit Flickr... + </string> + <string name="SocialFlickrPosting"> + Posten... + </string> + <string name="SocialFlickrDisconnecting"> + Flickr-Verbindung wird getrennt... + </string> + <string name="SocialFlickrErrorConnecting"> + Problem beim Verbinden mit Flickr + </string> + <string name="SocialFlickrErrorPosting"> + Problem beim Posten auf Flickr + </string> + <string name="SocialFlickrErrorDisconnecting"> + Problem beim Trennen der Flickr-Verbindung + </string> + <string name="SocialTwitterConnecting"> + Verbinden mit Twitter... + </string> + <string name="SocialTwitterPosting"> + Posten... + </string> + <string name="SocialTwitterDisconnecting"> + Twitter-Verbindung wird getrennt... + </string> + <string name="SocialTwitterErrorConnecting"> + Problem beim Verbinden mit Twitter + </string> + <string name="SocialTwitterErrorPosting"> + Problem beim Posten auf Twitter + </string> + <string name="SocialTwitterErrorDisconnecting"> + Problem beim Trennen der Twitter-Verbindung + </string> + <string name="BlackAndWhite"> + Schwarzweiß + </string> + <string name="Colors1970"> + Farben der Siebziger Jahre + </string> + <string name="Intense"> + Intensiv + </string> + <string name="Newspaper"> + Zeitungspapier + </string> + <string name="Sepia"> + Sepia + </string> + <string name="Spotlight"> + Spotlight + </string> + <string name="Video"> + Video + </string> + <string name="Autocontrast"> + Autokontrast + </string> + <string name="LensFlare"> + Blendenfleck + </string> + <string name="Miniature"> + Miniatur + </string> + <string name="Toycamera"> + Spielzeugkamera + </string> <string name="TooltipPerson"> Person </string> @@ -886,6 +955,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="use_texture"> Textur verwenden </string> + <string name="manip_hint1"> + Zum Einrasten Mauscursor + </string> + <string name="manip_hint2"> + über Lineal bewegen + </string> <string name="texture_loading"> Wird geladen... </string> @@ -4083,6 +4158,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="share_alert"> Objekte aus dem Inventar hier her ziehen </string> + <string name="flickr_post_success"> + Sie haben auf Flickr gepostet. + </string> + <string name="twitter_post_success"> + Sie haben auf Twitter gepostet. + </string> <string name="no_session_message"> (IM-Session nicht vorhanden) </string> @@ -4539,6 +4620,9 @@ Missbrauchsbericht <string name="LocalEstimateUSD"> [AMOUNT] US$ </string> + <string name="Group Ban"> + Gruppenverbannung + </string> <string name="Membership"> Mitgliedschaft </string> @@ -4961,6 +5045,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Destinations_Label"> Ziele </string> + <string name="Command_Facebook_Label"> + Facebook + </string> + <string name="Command_Flickr_Label"> + Flickr + </string> <string name="Command_Gestures_Label"> Gesten </string> @@ -5009,6 +5099,9 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Speak_Label"> Sprechen </string> + <string name="Command_Twitter_Label"> + Twitter + </string> <string name="Command_View_Label"> Kamerasteuerungen </string> @@ -5039,6 +5132,12 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Destinations_Tooltip"> Ziele von Interesse </string> + <string name="Command_Facebook_Tooltip"> + Auf Facebook posten + </string> + <string name="Command_Flickr_Tooltip"> + Auf Flickr hochladen + </string> <string name="Command_Gestures_Tooltip"> Gesten für Ihren Avatar </string> @@ -5087,6 +5186,9 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Speak_Tooltip"> Über Ihr Mikrofon mit Leuten in der Nähe sprechen </string> + <string name="Command_Twitter_Tooltip"> + Twitter + </string> <string name="Command_View_Tooltip"> Kamerawinkel ändern </string> diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml index 7ecf5fafae..d1c5e867db 100755 --- a/indra/newview/skins/default/xui/es/floater_stats.xml +++ b/indra/newview/skins/default/xui/es/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="Renderización" name="render"> <stat_bar label="KTris por fotograma" name="ktrisframe"/> <stat_bar label="KTris por segundo" name="ktrissec"/> - <stat_bar label="Objetos en total" name="objs"/> + <stat_bar label="Objetos en total" name="totalobjs"/> + <stat_bar label="Objetos en caché" name="cachedobjs"/> <stat_bar label="Objetos nuevos" name="newobjs"/> <stat_bar label="Índice de aciertos de caché de objetos" name="object_cache_hits"/> <stat_bar label="Consultas de oclusión realizadas" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index d5208f3d8f..d2117f08b6 100755 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -35,6 +35,9 @@ <menu_item_check label="Chat..." name="Nearby Chat"/> <menu_item_check label="Hablar" name="Speak"/> <menu_item_check label="Registro de conversación..." name="Conversation Log..."/> + <menu_item_call label="Facebook..." name="Facebook"/> + <menu_item_call label="Twitter..." name="Twitter"/> + <menu_item_call label="Flickr..." name="Flickr"/> <menu label="Transformación de voz" name="VoiceMorphing"> <menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/> <menu_item_check label="Probar..." name="Preview"/> @@ -149,7 +152,8 @@ <menu_item_check label="Ajustar a la cuadrícula" name="Snap to Grid"/> <menu_item_call label="Ajustar a la cuadrícula los ejes X e Y" name="Snap Object XY to Grid"/> <menu_item_call label="Usar lo seleccionado como cuadrícula" name="Use Selection for Grid"/> - <menu_item_call label="Opciones de la cuadrícula" name="Grid Options"/> + <menu_item_call label="Opciones de la cuadrícula..." name="Grid Options"/> + <menu_item_call label="Definir permisos predeterminados..." name="Set default permissions"/> </menu> <menu label="Subir" name="Upload"> <menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/> @@ -157,7 +161,6 @@ <menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/> <menu_item_call label="Modelo..." name="Upload Model"/> <menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/> - <menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/> </menu> <menu_item_call label="Deshacer" name="Undo"/> <menu_item_call label="Rehacer" name="Redo"/> @@ -287,6 +290,7 @@ <menu_item_check label="Actualizar el tipo" name="Update Type"/> <menu_item_check label="Información sobre el nivel de detalle" name="LOD Info"/> <menu_item_check label="Crear cola" name="Build Queue"/> + <menu_item_check label="Partículas" name="Particles"/> <menu_item_check label="Articulaciones" name="Joints"/> <menu_item_check label="Vectores de viento" name="Wind Vectors"/> <menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index ae421cdfd0..01407dc69e 100755 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -206,6 +206,22 @@ No podrás removérseles de ese rol, sino que deberán renunciar a él por sí m ¿Añadir esta capacidad a '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> + <notification name="AssignBanAbilityWarning"> + Vas a agregar la capacidad '[ACTION_NAME]' al rol '[ROLE_NAME]'. + + *ATENCIÓN* +Cualquier miembro de un rol que tenga esta capacidad también recibirá las capacidades '[ACTION_NAME_2]' y '[ACTION_NAME_3]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + Vas a quitar la capacidad '[ACTION_NAME]' del rol '[ROLE_NAME]'. + + *ATENCIÓN* +Al quitar esta capacidad NO se quitan las capacidades '[ACTION_NAME_2]' y '[ACTION_NAME_3]'. + +Si no quieres que este rol siga teniendo dichas capacidades, deshabilítalas inmediatamente. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> Estás a punto de expulsar a [AVATAR_NAME] del grupo. <usetemplate ignoretext="Confirmar la expulsión de un miembro del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/> @@ -1585,6 +1601,14 @@ Consulta [[INFO_URL] Información sobre esta actualización]. No es posible abandonar el grupo. No puedes abandonarlo porque eres su último propietario. Antes tienes que asignar el papel de propietario a otro miembro. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + No se puede abandonar el grupo: [reason]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + Has abandonado el grupo [group_name]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> ¿Quieres realmente expulsar a todos los residentes de la cuadrícula? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/> @@ -2468,6 +2492,12 @@ Inténtalo seleccionando un trozo más pequeño de terreno. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4035,6 +4065,10 @@ Prueba a seleccionar un terreno más pequeño. No se pueden mover los archivos. Ruta anterior restaurada. <usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + Ha ocurrido un problema al guardar los permisos predeterminados por el siguiente motivo: [REASON]. Intenta configurar los permisos predeterminados más adelante. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> El archivo de historial de chat todavía está realizando la operación anterior. Repite la operación dentro de unos minutos o inicia un chat con otra persona. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index 16ab4ff75b..db98ee088e 100755 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml @@ -11,8 +11,7 @@ <check_box label="Sólo saben si estoy conectado mis amigos y grupos" name="online_visibility"/> <check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/> <check_box label="Desconectar el micrófono cuando finalicen las llamadas" name="auto_disengage_mic_check"/> - <check_box label="Mostrar mis Hitos favoritos al Inicio de sesión (menú desplegable "Empezar -en")" name="favorites_on_login_check" top_pad="15"/> + <check_box label="Mostrar mis Hitos favoritos al Inicio de sesión (menú desplegable "Empezar en")" name="favorites_on_login_check" top_pad="15"/> <text name="Logs:"> Registros de chat: </text> diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml index 5cad6258ec..fae17e3608 100755 --- a/indra/newview/skins/default/xui/fr/floater_stats.xml +++ b/indra/newview/skins/default/xui/fr/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="Rendu" name="render"> <stat_bar label="KTris par image" name="ktrisframe"/> <stat_bar label="KTris par s" name="ktrissec"/> - <stat_bar label="Objets totaux" name="objs"/> + <stat_bar label="Total des objets" name="totalobjs"/> + <stat_bar label="Objets en cache" name="cachedobjs"/> <stat_bar label="Nouveaux objets" name="newobjs"/> <stat_bar label="Taux de réussite du cache des objets" name="object_cache_hits"/> <stat_bar label="Requêtes d'occlusion effectuées" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index af46d34b61..2325c8e34d 100755 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -209,6 +209,22 @@ Ajouter ce pouvoir à « [ROLE_NAME] » ? Ajouter ce pouvoir à « [ROLE_NAME] » ? <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> </notification> + <notification name="AssignBanAbilityWarning"> + Vous êtes sur le point d'ajouter le pouvoir « [ACTION_NAME] » au rôle « [ROLE_NAME] ». + + *AVERTISSEMENT* +Tout membre ayant un rôle doté de ce pouvoir disposera aussi des pouvoirs « [ACTION_NAME_2] » et « [ACTION_NAME_3] ». + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + Vous êtes sur le point de supprimer le pouvoir « [ACTION_NAME] » du rôle « [ROLE_NAME] ». + + *AVERTISSEMENT* +En supprimant ce pouvoir, vous ne supprimez PAS les pouvoirs « [ACTION_NAME_2] » et « [ACTION_NAME_3] ». + +Si vous ne voulez plus que ce rôle dispose de ces pouvoirs, désactivez-les immédiatement. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> Vous allez expulser [AVATAR_NAME] du groupe. <usetemplate ignoretext="Confirmer l'expulsion d'un membre du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/> @@ -1576,6 +1592,14 @@ Quitter le groupe ? Impossible de quitter le groupe. Vous ne pouvez pas quitter le groupe car vous en êtes le dernier propriétaire. Vous devez d'abord affecter le rôle de propriétaire à un autre membre. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + Impossible de quitter le groupe : [reason]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + Vous avez quitté le groupe [group_name]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> Souhaitez-vous vraiment éjecter tous les résidents de la grille ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous les résidents"/> @@ -2460,6 +2484,12 @@ Veuillez sélectionner un terrain plus petit. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4036,6 +4066,10 @@ Veuillez sélectionner un terrain plus petit. Impossible de déplacer les fichiers. Chemin précédent rétabli. <usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + Une erreur est survenue lors de l'enregistrement des droits par défaut, suite au problème suivant : [REASON]. Réessayez de définir les droits par défaut ultérieurement. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> Le fichier d'historique des chats est occupé à traiter l'opération précédente. Réessayez dans quelques minutes ou choisissez une autre personne pour le chat. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml index 1d850516b7..7516af957e 100755 --- a/indra/newview/skins/default/xui/it/floater_stats.xml +++ b/indra/newview/skins/default/xui/it/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="Render" name="render"> <stat_bar label="KTris per fotogramma" name="ktrisframe"/> <stat_bar label="KTris per secondo" name="ktrissec"/> - <stat_bar label="Totale oggetti" name="objs"/> + <stat_bar label="Totale oggetti" name="totalobjs"/> + <stat_bar label="Oggetti nella cache" name="cachedobjs"/> <stat_bar label="Nuovi oggetti" name="newobjs"/> <stat_bar label="Hit rate della cache per l'oggetto" name="object_cache_hits"/> <stat_bar label="Occlusion query eseguite" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 3e6589927d..f535a53e66 100755 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -36,6 +36,9 @@ <menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/> <menu_item_check label="Parla" name="Speak"/> <menu_item_check label="Registro conversazioni..." name="Conversation Log..."/> + <menu_item_call label="Facebook..." name="Facebook"/> + <menu_item_call label="Twitter..." name="Twitter"/> + <menu_item_call label="Flickr..." name="Flickr"/> <menu label="Manipolazione voce" name="VoiceMorphing"> <menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/> <menu_item_check label="Anteprima..." name="Preview"/> @@ -150,7 +153,8 @@ <menu_item_check label="Posiziona nella griglia" name="Snap to Grid"/> <menu_item_call label="Posiziona coordinate XY dell'oggetto sulla griglia" name="Snap Object XY to Grid"/> <menu_item_call label="Usa la selezione per la griglia" name="Use Selection for Grid"/> - <menu_item_call label="Opzioni della griglia" name="Grid Options"/> + <menu_item_call label="Opzioni della griglia..." name="Grid Options"/> + <menu_item_call label="Imposta diritti predefiniti..." name="Set default permissions"/> </menu> <menu label="Carica sul server" name="Upload"> <menu_item_call label="Immagine ([COST] L$)..." name="Upload Image"/> @@ -158,7 +162,6 @@ <menu_item_call label="Animazione ([COST] L$)..." name="Upload Animation"/> <menu_item_call label="Modella..." name="Upload Model"/> <menu_item_call label="In blocco ([COST] L$ per file)..." name="Bulk Upload"/> - <menu_item_call label="Definisci diritti di caricamento predefiniti" name="perm prefs"/> </menu> <menu_item_call label="Annulla" name="Undo"/> <menu_item_call label="Ripeti" name="Redo"/> @@ -288,6 +291,7 @@ <menu_item_check label="Aggiorna tipo" name="Update Type"/> <menu_item_check label="Info livello dettaglio" name="LOD Info"/> <menu_item_check label="Crea coda" name="Build Queue"/> + <menu_item_check label="Particelle" name="Particles"/> <menu_item_check label="Giunti" name="Joints"/> <menu_item_check label="Vettori vento" name="Wind Vectors"/> <menu_item_check label="Complessità rendering" name="rendercomplexity"/> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 45c89ecd7a..11211e01fe 100755 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -210,6 +210,22 @@ Aggiungi questo potere a '[ROLE_NAME]'? Aggiungi questo potere a '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="No" yestext="Si"/> </notification> + <notification name="AssignBanAbilityWarning"> + Stai per aggiungere l'abilità '[ACTION_NAME]' al ruolo '[ROLE_NAME]'. + + *AVVISO* +A tutti i membri che in un ruolo hanno questa abilità verranno concesse anche le abilità '[ACTION_NAME_2]' e '[ACTION_NAME_3]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + Stai rimuovendo l'abilità '[ACTION_NAME]' dal ruolo '[ROLE_NAME]'. + + *AVVISO* +Rimuovendo questa abilità, NON rimuovi le abilità '[ACTION_NAME_2]' e '[ACTION_NAME_3]'. + +Se non desideri che queste abilità siano assegnate a questo ruolo, disattivale immediatamente. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> Stai per espellere [AVATAR_NAME] dal gruppo. <usetemplate ignoretext="Conferma l'espulsione di un partecipante dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/> @@ -1580,6 +1596,14 @@ Lasciare il gruppo? Impossibile abbandonare il gruppo. Non puoi abbandonare il gruppo perché sei l'ultimo proprietario del gruppo. Devi prima assegnare a un altro membro il ruolo di proprietario. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + Impossibile abbandonare il gruppo: [reason]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + Hai abbandonato il gruppo [group_name]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> Vuoi veramente espellere tutti i residenti dalla griglia? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli tutti i residenti"/> @@ -2465,6 +2489,12 @@ Prova a selezionare una parte di terreno più piccola. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4042,6 +4072,10 @@ Prova a selezionare un pezzo di terreno più piccolo. Impossibile spostare i file. Il percorso precedente è stato ripristinato. <usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + Si è verificato un problema nel salvare i diritti predefiniti per il motivo seguente: [REASON]. Riprova più tardi. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> Il file della cronologia del file sta ancora eseguendo l'operazione precedente. Riprova nuovamente tra qualche minuto oppure chatta con un'altra persona. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml index 2b3b51f3b7..3bc343639b 100755 --- a/indra/newview/skins/default/xui/ja/floater_stats.xml +++ b/indra/newview/skins/default/xui/ja/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="描画" name="render"> <stat_bar label="KTris (フレームごと)" name="ktrisframe"/> <stat_bar label="KTris (秒ごと)" name="ktrissec"/> - <stat_bar label="オブジェクト合計" name="objs"/> + <stat_bar label="オブジェクト合計" name="totalobjs"/> + <stat_bar label="キャッシュされたオブジェクト" name="cachedobjs"/> <stat_bar label="新規オブジェクト" name="newobjs"/> <stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/> <stat_bar label="閉鎖クエリ実行" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 518f82daaf..1d52b42039 100755 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -221,6 +221,22 @@ この能力を [ROLE_NAME] に割り当てますか？ <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> + <notification name="AssignBanAbilityWarning"> + 役割 '[ROLE_NAME]' に能力 '[ACTION_NAME]' を追加しようとしています。 + +*警告* +この能力を持つ役割のメンバーにも能力 '[ACTION_NAME_2]' と '[ACTION_NAME_3]' が許可されます + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + 役割 '[ROLE_NAME]' から能力 '[ACTION_NAME]' を削除しようとしています。 + +*警告* +この能力を削除しても能力 '[ACTION_NAME_2]' と '[ACTION_NAME_3]' は削除されません。 + +これらの能力をこの役割に許可しない場合は、すぐに削除してください! + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> [AVATAR_NAME] をグループから追放しようとしています。 <usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/> @@ -1614,6 +1630,14 @@ http://secondlife.com/download から最新バージョンをダウンロード グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。 <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + グループを抜けることができません: [reason]。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + グループ [group_name] を抜けました。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> 本当に住人全員をグリッドから追い出しますか？ <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/> @@ -2507,6 +2531,12 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4076,6 +4106,10 @@ M キーを押して変更します。 ファイルを移動できません。以前のパスがリストアされました。 <usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + 次の理由により、デフォルト権限を保存するときに問題がありました: [REASON]。後でデフォルト権限を設定してください。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> チャット履歴ファイルが前の操作でビジーです。2、3 分経ってからもう一度試すか、別の人とのチャットを選択してください。 <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml index ef3307f54a..f41fe17778 100755 --- a/indra/newview/skins/default/xui/pt/floater_stats.xml +++ b/indra/newview/skins/default/xui/pt/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="Render" name="render"> <stat_bar label="KTris por quadro" name="ktrisframe"/> <stat_bar label="KTris por segundo" name="ktrissec"/> - <stat_bar label="Total Objects" name="objs"/> + <stat_bar label="Objetos totais" name="totalobjs"/> + <stat_bar label="Objetos em cache" name="cachedobjs"/> <stat_bar label="New Objects" name="newobjs"/> <stat_bar label="Taxa de acertos do cache do objeto" name="object_cache_hits"/> <stat_bar label="Consultas de oclusão realizadas" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index d106c47c64..a761cfa177 100755 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -36,6 +36,9 @@ <menu_item_check label="Bate-papo local..." name="Nearby Chat"/> <menu_item_check label="Falar" name="Speak"/> <menu_item_check label="Registro de conversas..." name="Conversation Log..."/> + <menu_item_call label="Facebook..." name="Facebook"/> + <menu_item_call label="Twitter..." name="Twitter"/> + <menu_item_call label="Flickr..." name="Flickr"/> <menu label="Distorção de voz" name="VoiceMorphing"> <menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/> <menu_item_check label="Visualizar..." name="Preview"/> @@ -150,7 +153,8 @@ <menu_item_check label="Encaixar em grade" name="Snap to Grid"/> <menu_item_call label="Encaixar objeto XY em grade" name="Snap Object XY to Grid"/> <menu_item_call label="Usar seleção em grade" name="Use Selection for Grid"/> - <menu_item_call label="Opções de grade" name="Grid Options"/> + <menu_item_call label="Opções de grade..." name="Grid Options"/> + <menu_item_call label="Definir permissões padrão..." name="Set default permissions"/> </menu> <menu label="Upload" name="Upload"> <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> @@ -158,7 +162,6 @@ <menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/> <menu_item_call label="Modelar..." name="Upload Model"/> <menu_item_call label="Volume (L$[COST] por arquivo)..." name="Bulk Upload"/> - <menu_item_call label="Autorizações de upload padrão" name="perm prefs"/> </menu> <menu_item_call label="Desfazer" name="Undo"/> <menu_item_call label="Repetir" name="Redo"/> @@ -288,6 +291,7 @@ <menu_item_check label="Tipo de atualização" name="Update Type"/> <menu_item_check label="Dados LOD" name="LOD Info"/> <menu_item_check label="Fila de construção" name="Build Queue"/> + <menu_item_check label="Partículas" name="Particles"/> <menu_item_check label="Junções" name="Joints"/> <menu_item_check label="Vetores de vento" name="Wind Vectors"/> <menu_item_check label="Renderizar complexidade" name="rendercomplexity"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 4e6b0765cb..00c0b13670 100755 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -209,6 +209,22 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sí mesmo -- Adicionar esta habilidade a '[ROLE_NAME]'? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> + <notification name="AssignBanAbilityWarning"> + Você está prestes a adicionar a função '[ACTION_NAME]' ao cargo '[ROLE_NAME]'. + + *AVISO* +Qualquer membro em um cargo com essa função também terá as funções '[ACTION_NAME_2]' e '[ACTION_NAME_3]' + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + Você está removendo a função '[ACTION_NAME]' do cargo '[ROLE_NAME]'. + + *AVISO* +Remover essa função NÃO removerá as funções '[ACTION_NAME_2]' e '[ACTION_NAME_3]'. + +Se você não quiser que essas funções sejam concedidas a esse cargo, desative-as imediatamente. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> Você está prestes a expulsar [AVATAR_NAME] do grupo. <usetemplate ignoretext="Confirmar expulsão de um participante do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/> @@ -1570,6 +1586,14 @@ consulte a informação [[INFO_URL] sobre essa atualização] Não foi possível deixar o grupo. Você não pode deixar o grupo pois é o último proprietário dele. Primeiramente, atribua outro membro à função de proprietário. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + Não foi possível deixar o grupo: [reason]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + Você deixou o grupo [group_name]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> Tem CERTEZA de que deseja expulsar todos os residentes do grid? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/> @@ -2451,6 +2475,12 @@ Selecione só um objeto. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4024,6 +4054,10 @@ Tente selecionar uma quantidade menor de terreno. Não foi possível mover arquivos. Caminho anterior restaurado. <usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + Ocorreu um problema ao salvar as permissões padrão devido ao seguinte motivo: [REASON]. Tente definir as permissões padrão mais tarde. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> O arquivo de histórico de bate-papo está ocupado com uma operação anterior. Tente novamente em alguns minutos ou selecione outra pessoa para bater papo. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml index 33a14adca9..10e9f5a7f4 100755 --- a/indra/newview/skins/default/xui/ru/floater_stats.xml +++ b/indra/newview/skins/default/xui/ru/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="Отрисовка" name="render"> <stat_bar label="Треугольников на кадр" name="ktrisframe"/> <stat_bar label="Треугольников в секунду" name="ktrissec"/> - <stat_bar label="Всего объектов" name="objs"/> + <stat_bar label="Всего объектов" name="totalobjs"/> + <stat_bar label="Кэшированных объектов" name="cachedobjs"/> <stat_bar label="Новых объектов" name="newobjs"/> <stat_bar label="Частота попаданий в кэш объектов" name="object_cache_hits"/> <stat_bar label="Выполненные запросы на смыкание" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 336a97f35a..c312bcbef4 100755 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -210,6 +210,22 @@ Добавить эту способность к роли «[ROLE_NAME]»? <usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/> </notification> + <notification name="AssignBanAbilityWarning"> + Вы собираетесь добавить способность «[ACTION_NAME]» к роли «[ROLE_NAME]». + + *ПРЕДУПРЕЖДЕНИЕ* +Любой участник в роли с этой способностью также получает способности «[ACTION_NAME_2]» и «[ACTION_NAME_3]» + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + Вы удаляете способность «[ACTION_NAME]» для роли «[ROLE_NAME]». + + *ПРЕДУПРЕЖДЕНИЕ* +При удалении этой способности НЕ БУДУТ удалены способности «[ACTION_NAME_2]» и «[ACTION_NAME_3]». + +Если вам больше не нужны эти способности для данной роли, немедленно отключите их! + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="EjectGroupMemberWarning"> Вы собираетесь исключить [AVATAR_NAME] из группы. <usetemplate ignoretext="Подтвердите исключение участника из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/> @@ -1579,6 +1595,14 @@ http://secondlife.com/download. Невозможно покинуть группу. Вы не можете покинуть группу, так как вы ее последний владелец. Сначала назначьте владельцем другого участника. <usetemplate name="okbutton" yestext="OK"/> </notification> + <notification name="GroupDepartError"> + Невозможно покинуть группу: [reason]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> + <notification name="GroupDepart"> + Вы покинули группу [group_name]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ConfirmKick"> Вы ДЕЙСТВИТЕЛЬНО хотите выбросить всех жителей с сетки? <usetemplate name="okcancelbuttons" notext="Отмена" yestext="Выбросить всех жителей"/> @@ -2460,6 +2484,12 @@ http://secondlife.com/download. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4036,6 +4066,10 @@ http://secondlife.com/download. Невозможно переместить файлы. Восстановлен прежний путь. <usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/> </notification> + <notification name="DefaultObjectPermissions"> + Ошибка при сохранении стандартных разрешений по следующей причине: [REASON]. Попробуйте задать стандартные разрешения через некоторое время. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> Файл журнала чата занят предыдущей операцией. Повторите попытку через несколько минут или выберите чат с другим лицом. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml index 2c0c33737f..1ae42ad382 100755 --- a/indra/newview/skins/default/xui/tr/floater_stats.xml +++ b/indra/newview/skins/default/xui/tr/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="İşle" name="render"> <stat_bar label="Çerçeve Başına Üçgenler" name="ktrisframe"/> <stat_bar label="Saniye Başına Üçgenler" name="ktrissec"/> - <stat_bar label="Toplam Nesne" name="objs"/> + <stat_bar label="Toplam Nesne" name="totalobjs"/> + <stat_bar label="Önbelleğe Alınan Nesne" name="cachedobjs"/> <stat_bar label="Yeni Nesne" name="newobjs"/> <stat_bar label="Nesne Önbellek İsabet Oranı" name="object_cache_hits"/> <stat_bar label="Gerçekleştirilen Gölgeleme Sorguları" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index a58abca3ac..2364bd5acf 100755 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -210,6 +210,22 @@ Bu Yetenek '[ROLE_NAME]' rolüne eklensin mi? Bu Yetenek '[ROLE_NAME]' rolüne eklensin mi? <usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/> </notification> + <notification name="AssignBanAbilityWarning"> + "[ROLE_NAME]" rolüne "[ACTION_NAME]" yeteneğini eklemek üzeresiniz. + + *UYARI* +Bu Yeteneğe sahip bir Roldeki Üyeler "[ACTION_NAME_2]" ve "[ACTION_NAME_3]" yeteneklerine de sahip olacak. + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + "[ROLE_NAME]" rolünden "[ACTION_NAME]" yeteneğini kaldırıyorsunuz. + + *UYARI* +Bu yeteneğin kaldırılması "[ACTION_NAME_2]" ve "[ACTION_NAME_3]" yeteneklerini kaldırmaz. + +Bu yeteneklerin artık bu rolde bulunmasını istemiyorsanız, onları hemen devre dışı bırakın! + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> <notification name="EjectGroupMemberWarning"> Gruptan [AVATAR_NAME] adlı üyeyi çıkarmak üzeresiniz. <usetemplate ignoretext="Gruptan bir katılımcının çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/> @@ -1579,6 +1595,14 @@ Gruptan ayrılmak istiyor musunuz? Gruptan ayrılınamıyor. Gruptan ayrılamazsınız çünkü grubun son sahibisiniz. Lütfen önce sahip rolüne başka bir üye atayın. <usetemplate name="okbutton" yestext="Tamam"/> </notification> + <notification name="GroupDepartError"> + Gruptan ayrılma işlemi yapılamıyor: [reason]. + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> + <notification name="GroupDepart"> + [group_name] grubundan ayrıldınız. + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> <notification name="ConfirmKick"> Tüm Sakinleri GERÇEKTEN ağ dışına çıkarmak istiyor musunuz? <usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tüm Sakinleri Çıkar"/> @@ -2460,6 +2484,12 @@ Daha küçük bir arazi parçası seçmeyi deneyin. <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4030,6 +4060,10 @@ Daha küçük bir arazi parçası seçmeyi deneyin. Dosyalar taşınamıyor. Önceki yol geri yüklendi. <usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/> </notification> + <notification name="DefaultObjectPermissions"> + Aşağıdaki nedenden dolayı, varsayılan izinler kaydedilirken bir sorun oluştu: [REASON]. Varsayılan izinleri ayarlamayı lütfen daha sonra tekrar deneyin. + <usetemplate name="okbutton" yestext="Tamam"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> Sohbet geçmişi dosyası önceki işlemi gerçekleştirmekle meşgul. Lütfen bir kaç dakika sonra tekrar deneyin veya başka bir kişiyle sohbet etmeyi deneyin. <usetemplate name="okbutton" yestext="Tamam"/> diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml index 282e61e73d..f06eb5e78f 100755 --- a/indra/newview/skins/default/xui/zh/floater_stats.xml +++ b/indra/newview/skins/default/xui/zh/floater_stats.xml @@ -12,7 +12,8 @@ <stat_view label="呈像" name="render"> <stat_bar label="KTris（每幀）" name="ktrisframe"/> <stat_bar label="KTris（每秒）" name="ktrissec"/> - <stat_bar label="物件總計" name="objs"/> + <stat_bar label="物件總計" name="totalobjs"/> + <stat_bar label="存入快取的物件" name="cachedobjs"/> <stat_bar label="新物件" name="newobjs"/> <stat_bar label="物件快取讀取率" name="object_cache_hits"/> <stat_bar label="已執行遮蔽查詢" name="occlusion_queries"/> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 46cbaa60b1..bd05725e2b 100755 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -210,6 +210,22 @@ 你仍要新增這項能力給「[ROLE_NAME]」？ <usetemplate name="okcancelbuttons" notext="否" yestext="是"/> </notification> + <notification name="AssignBanAbilityWarning"> + 你即將把「[ACTION_NAME]」能力增加給「[ROLE_NAME]」角色。 + + *警告* +任何擔任帶有此能力的角色的成員，將連帶得到「[ACTION_NAME_2]」和「[ACTION_NAME_3]」能力。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="RemoveBanAbilityWarning"> + 你即將剝除「[ROLE_NAME]」角色的「[ACTION_NAME]」能力。 + + *警告* +剝除這個能力，將不連帶剝除「[ACTION_NAME_2]」和「[ACTION_NAME_3]」能力。 + +如果你不希望讓這個角色繼續擁有這些能力，請立即取消它們！ + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="EjectGroupMemberWarning"> 你即將把 [AVATAR_NAME] 踢出群組。 <usetemplate ignoretext="確定將某人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/> @@ -1569,6 +1585,14 @@ SHA1 指紋：[MD5_DIGEST] 無法離開群組。 你是此群組僅存的所有人，不得離開群組。 請先把所有人職銜指派給另一人。 <usetemplate name="okbutton" yestext="確定"/> </notification> + <notification name="GroupDepartError"> + 無法離開群組：[reason]。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> + <notification name="GroupDepart"> + 你已經離開[group_name]群組。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="ConfirmKick"> 你確定要踢出這網格內的全部居民？ <usetemplate name="okcancelbuttons" notext="取消" yestext="踢出全部居民"/> @@ -2450,6 +2474,12 @@ SHA1 指紋：[MD5_DIGEST] <notification name="SystemMessage"> [MESSAGE] </notification> + <notification name="FlickrConnect"> + [MESSAGE] + </notification> + <notification name="TwitterConnect"> + [MESSAGE] + </notification> <notification name="PaymentReceived"> [MESSAGE] </notification> @@ -4027,6 +4057,10 @@ SHA1 指紋：[MD5_DIGEST] 無法移動檔案。 已恢復前一個路徑。 <usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/> </notification> + <notification name="DefaultObjectPermissions"> + 儲存預設權限時出問題，原因：[REASON]。 請稍後再嘗試儲存預設權限。 + <usetemplate name="okbutton" yestext="確定"/> + </notification> <notification name="ChatHistoryIsBusyAlert"> 聊天紀錄檔案還在處理前一個動作。 請稍候再試，或請換一個聊天對象。 <usetemplate name="okbutton" yestext="確定"/> |