Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ScriptQuestion strings from floater_chat_history.xml to strings.xml

Browse Source
This commit is contained in:
Lirusaito
2013-07-17 11:56:02 -04:00
parent ede1282307
commit a1d9473fde
10 changed files with 27 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewermessage.cpp
View File

@@ -6740,9 +6740,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
perms.append(", ");
}
LLStringUtil::format_map_t args;
args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
perms.append(LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args));
perms.append(LLTrans::getString(SCRIPT_QUESTIONS[i]));
}
}
@@ -6918,14 +6916,11 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
{
if (questions & LSCRIPTRunTimePermissionBits[i])
{
LLStringUtil::format_map_t args;
args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
count++;
script_question += " " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args) + "\n";
// check whether permission question should cause special caution dialog
caution |= (SCRIPT_QUESTION_IS_CAUTION[i]);
script_question += " " + LLTrans::getString(SCRIPT_QUESTIONS[i]) + "\n";
}
}
args["QUESTIONS"] = script_question;

15
indra/newview/skins/default/xui/de/floater_chat_history.xml
View File

@@ -7,21 +7,6 @@
<string name="voice_icon">icn_voice-localchat.tga</string>
<string name="IM_logging_string">-- Instant-Message-Protokoll aktiviert --</string>
<string name="IM_end_log_string">-- Ende des Protokolls --</string>
<string name="ScriptQuestionCautionChatGranted">Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung erteilt: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Linden-Dollar (L$) von Ihnen nehmen</string>
<string name="ActOnControlInputs">Steuerung festlegen</string>
<string name="RemapControlInputs">Steuerung neu zuweisen</string>
<string name="AnimateYourAvatar">Avatar animieren</string>
<string name="AttachToYourAvatar">An Avatar anhängen</string>
<string name="ReleaseOwnership">Eigentum aufgeben und öffentlich machen</string>
<string name="LinkAndDelink">Mit Objekten verknüpfen und davon trennen</string>
<string name="AddAndRemoveJoints">Verbindungen zu anderen Objekten hinzufügen und entfernen</string>
<string name="ChangePermissions">Berechtigungen ändern</string>
<string name="TrackYourCamera">Kameraverfolgung aktivieren</string>
<string name="TeleportYourAgent">Avatar teleportieren</string>
<string name="ControlYourCamera">Kamerasteuerung übernehmen</string>
<string name="OverrideAnimations">Überschreibe die Standard-Animationen</string>
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
<layout_stack name="im_contents_stack">

2
indra/newview/skins/default/xui/de/strings.xml
View File

@@ -316,6 +316,8 @@
<string name="connected">Verbunden</string>
<string name="unavailable">Der aktuelle Standort unterstützt keine Voice-Kommunikation</string>
<string name="hang_up">Verbindung mit In-Welt-Voice-Chat getrennt</string>
<string name="ScriptQuestionCautionChatGranted">Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung erteilt: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Take currency from you</string>
<string name="ActOnControlInputs">Steuerung festlegen</string>
<string name="RemapControlInputs">Steuerung neu zuweisen</string>

15
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -8,21 +8,6 @@
<string name="voice_icon">icn_voice-localchat.tga</string>
<string name="IM_logging_string">-- Instant message logging enabled --</string>
<string name="IM_end_log_string">-- End of Log --</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Take in-world money ([CURRENCY]) from you</string>
<string name="ActOnControlInputs">Act on your control inputs</string>
<string name="RemapControlInputs">Remap your control inputs</string>
<string name="AnimateYourAvatar">Animate your avatar</string>
<string name="AttachToYourAvatar">Attach to your avatar</string>
<string name="ReleaseOwnership">Release ownership and become public</string>
<string name="LinkAndDelink">Link and delink from other objects</string>
<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
<string name="ChangePermissions">Change its permissions</string>
<string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</string>
<string name="OverrideAnimations">Override your default animations</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="160" left="0" orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" height="160" left="0" min_width="275" name="im_contents_panel" width="305">
<layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="160" left="0" orientation="vertical" name="im_contents_stack" width="305">

2
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -320,6 +320,8 @@
<string name="connected">Connected</string>
<string name="unavailable">Voice not available at your current location</string>
<string name="hang_up">Disconnected from in-world Voice Chat</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Take currency from you</string>
<string name="ActOnControlInputs">Act on your control inputs</string>
<string name="RemapControlInputs">Remap your control inputs</string>

45
indra/newview/skins/default/xui/es/floater_chat_history.xml
View File

@@ -18,51 +18,6 @@
<string name="IM_end_log_string">
-- Fin del Registro --
</string>
<string name="ScriptQuestionCautionChatGranted">
el objeto '[OBJECTNAME]', propiedad de '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
</string>
<string name="ScriptQuestionCautionChatDenied">
al objeto '[OBJECTNAME]', propiedad de '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
</string>
<string name="ScriptTakeMoney">
Transferir ([CURRENCY]) de tu cuenta
</string>
<string name="ActOnControlInputs">
Actuar en tus controles de entrada
</string>
<string name="RemapControlInputs">
Reconfigurar tus controles de entrada
</string>
<string name="AnimateYourAvatar">
Animar tu avatar
</string>
<string name="AttachToYourAvatar">
Anexarse a tu avatar
</string>
<string name="ReleaseOwnership">
Anular propiedad y pasar a ser público
</string>
<string name="LinkAndDelink">
Enlazarse y desenlazarse de otros objetos
</string>
<string name="AddAndRemoveJoints">
Añadir y quitar uniones con otros objetos
</string>
<string name="ChangePermissions">
Cambiar sus permisos
</string>
<string name="TrackYourCamera">
Seguir tu cámara
</string>
<string name="TeleportYourAgent">
Teleportarte
</string>
<string name="ControlYourCamera">
Controlar tu cámara
</string>
<string name="OverrideAnimations">
Reemplazar tus animaciones predeterminadas
</string>
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
<layout_stack name="im_contents_stack">

6
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -288,6 +288,12 @@
<string name="unavailable">Chat de Voz no disponible en esta ubicación</string>
<string name="hang_up">Desconectado del Chat de Voz</string>
<string name="conference-title">Chat multi-persona</string>
<string name="ScriptQuestionCautionChatGranted">
el objeto '[OBJECTNAME]', propiedad de '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
</string>
<string name="ScriptQuestionCautionChatDenied">
al objeto '[OBJECTNAME]', propiedad de '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
</string>
<string name="ScriptTakeMoney">Transferir moneda de tu cuenta</string>
<string name="ActOnControlInputs">Actuar en tus controles de entrada</string>
<string name="RemapControlInputs">Reconfigurar tus controles de entrada</string>

14
indra/newview/skins/default/xui/fr/floater_chat_history.xml
View File

@@ -7,20 +7,6 @@
<string name="voice_icon">icn_voice-localchat.tga</string>
<string name="IM_logging_string">-- Archivage des IM activé --</string>
<string name="IM_end_log_string">- Fin de l'archivage --</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu le droit de: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n'a pas reçu le droit de: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Débiter vos ([CURRENCY])</string>
<string name="ActOnControlInputs">Utiliser vos touches de commandes</string>
<string name="RemapControlInputs">Reconfigurer vos touches de commandes</string>
<string name="AnimateYourAvatar">Animer votre avatar</string>
<string name="AttachToYourAvatar">Attacher à votre avatar</string>
<string name="ReleaseOwnership">Passer l'objet dans le domaine public (sans propriétaire)</string>
<string name="LinkAndDelink">Lier et délier d'autres objets</string>
<string name="AddAndRemoveJoints">Créer et supprimer des liens avec d'autres objets</string>
<string name="ChangePermissions">Modifier ses droits</string>
<string name="TrackYourCamera">Suivre votre caméra</string>
<string name="ControlYourCamera">Contrôler votre caméra</string>
<string name="TeleportYourAgent">Vous téléporter</string>
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
<layout_stack name="im_contents_stack">

14
indra/newview/skins/default/xui/fr/strings.xml
View File

@@ -386,6 +386,20 @@
<string name="shout">
crie :
</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu le droit de: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n'a pas reçu le droit de: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Débiter vos ([CURRENCY])</string>
<string name="ActOnControlInputs">Utiliser vos touches de commandes</string>
<string name="RemapControlInputs">Reconfigurer vos touches de commandes</string>
<string name="AnimateYourAvatar">Animer votre avatar</string>
<string name="AttachToYourAvatar">Attacher à votre avatar</string>
<string name="ReleaseOwnership">Passer l'objet dans le domaine public (sans propriétaire)</string>
<string name="LinkAndDelink">Lier et délier d'autres objets</string>
<string name="AddAndRemoveJoints">Créer et supprimer des liens avec d'autres objets</string>
<string name="ChangePermissions">Modifier ses droits</string>
<string name="TrackYourCamera">Suivre votre caméra</string>
<string name="ControlYourCamera">Contrôler votre caméra</string>
<string name="TeleportYourAgent">Vous téléporter</string>
<string name="SIM_ACCESS_PG">
PG
</string>

39
indra/newview/skins/default/xui/pt/floater_chat_history.xml
View File

@@ -21,45 +21,6 @@
<string name="IM_end_log_string">
-- Fim do Log --
</string>
<string name="ScriptQuestionCautionChatGranted">
'[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS].
</string>
<string name="ScriptQuestionCautionChatDenied">
'[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS].
</string>
<string name="ScriptTakeMoney">
Tomar linden dólares ([CURRENCY]) de você
</string>
<string name="ActOnControlInputs">
Atue nas suas entradas de controle
</string>
<string name="RemapControlInputs">
Remapeie suas entradas de controle
</string>
<string name="AnimateYourAvatar">
Faça uma animação para o seu avatar
</string>
<string name="AttachToYourAvatar">
Anexe ao seu avatar
</string>
<string name="ReleaseOwnership">
Libere a propriedade e torne-a pública
</string>
<string name="LinkAndDelink">
Una e desuna de outros objetos
</string>
<string name="AddAndRemoveJoints">
Adicione e remova junções com outros objetos
</string>
<string name="ChangePermissions">
Modifique as permissões
</string>
<string name="TrackYourCamera">
Acompanhe sua câmera
</string>
<string name="ControlYourCamera">
Controle sua camera
</string>
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
<combo_box label="Gestos" name="Gesture">