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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-08-12 22:58:22 -04:00
parent 408eab13f0 7335ae548c
commit 67f4797e09
202 changed files with 17392 additions and 17373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmessage/llcurl.cpp
View File

@@ -291,7 +291,9 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
// set no DNS caching as default for all easy handles. This prevents them adopting a // set no DNS caching as default for all easy handles. This prevents them adopting a
// multi handles cache if they are added to one. // multi handles cache if they are added to one.
CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0); CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 10);
check_curl_code(result);
result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
check_curl_code(result); check_curl_code(result);
// Disable SSL/TLS session caching. Some servers refuse to talk to us when session ids are enabled. // Disable SSL/TLS session caching. Some servers refuse to talk to us when session ids are enabled.
@@ -479,6 +481,8 @@ void LLCurl::Easy::prepRequest(const std::string& url,
//setopt(CURLOPT_VERBOSE, 1); // useful for debugging //setopt(CURLOPT_VERBOSE, 1); // useful for debugging
setopt(CURLOPT_NOSIGNAL, 1); setopt(CURLOPT_NOSIGNAL, 1);
setopt(CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
// Set the CURL options for either Socks or HTTP proxy // Set the CURL options for either Socks or HTTP proxy
LLProxy::getInstance()->applyProxySettings(this); LLProxy::getInstance()->applyProxySettings(this);

4
indra/llui/llbutton.cpp
View File

@@ -1063,11 +1063,13 @@ void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign a
if (image_name.empty()) if (image_name.empty())
{ {
mImageOverlay = NULL; mImageOverlay = NULL;
mImageOverlaySelectedColor = LLColor4::white;
} }
else else
{ {
mImageOverlay = LLUI::getUIImage(image_name); mImageOverlay = LLUI::getUIImage(image_name);
mImageOverlayAlignment = alignment; mImageOverlayAlignment = alignment;
mImageOverlaySelectedColor = color;
mImageOverlayColor = color; mImageOverlayColor = color;
} }
} }
@@ -1077,11 +1079,13 @@ void LLButton::setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignmen
if (image_id.isNull()) if (image_id.isNull())
{ {
mImageOverlay = NULL; mImageOverlay = NULL;
mImageOverlaySelectedColor = LLColor4::white;
} }
else else
{ {
mImageOverlay = LLUI::getUIImageByID(image_id); mImageOverlay = LLUI::getUIImageByID(image_id);
mImageOverlayAlignment = alignment; mImageOverlayAlignment = alignment;
mImageOverlaySelectedColor = color;
mImageOverlayColor = color; mImageOverlayColor = color;
} }
} }

30
indra/newview/llviewermessage.cpp
View File

@@ -219,19 +219,20 @@ const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
//script permissions //script permissions
const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
{ {
"ScriptTakeMoney", "ScriptTakeMoney",
"ActOnControlInputs", "ActOnControlInputs",
"RemapControlInputs", "RemapControlInputs",
"AnimateYourAvatar", "AnimateYourAvatar",
"AttachToYourAvatar", "AttachToYourAvatar",
"ReleaseOwnership", "ReleaseOwnership",
"LinkAndDelink", "LinkAndDelink",
"AddAndRemoveJoints", "AddAndRemoveJoints",
"ChangePermissions", "ChangePermissions",
"TrackYourCamera", "TrackYourCamera",
"ControlYourCamera" "ControlYourCamera",
}; "TeleportYourAgent"
};
const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
{ {
@@ -245,7 +246,8 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
FALSE, // AddAndRemoveJoints FALSE, // AddAndRemoveJoints
FALSE, // ChangePermissions FALSE, // ChangePermissions
FALSE, // TrackYourCamera, FALSE, // TrackYourCamera,
FALSE // ControlYourCamera FALSE, // ControlYourCamera
FALSE // TeleportYourAgent
}; };
bool friendship_offer_callback(const LLSD& notification, const LLSD& response) bool friendship_offer_callback(const LLSD& notification, const LLSD& response)

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

@@ -20,6 +20,7 @@
<string name="AddAndRemoveJoints">Add and remove joints with other objects</string> <string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
<string name="ChangePermissions">Change its permissions</string> <string name="ChangePermissions">Change its permissions</string>
<string name="TrackYourCamera">Track your camera</string> <string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</string> <string name="ControlYourCamera">Control your camera</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels"> <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305"> <layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">

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

@@ -60,6 +60,9 @@
<string name="ControlYourCamera"> <string name="ControlYourCamera">
Controlar tu cámara Controlar tu cámara
</string> </string>
<string name="TeleportYourAgent">
Teleportarte
</string>
<layout_stack name="panels"> <layout_stack name="panels">
<layout_panel name="im_contents_panel"> <layout_panel name="im_contents_panel">
<combo_box label="Gestos" name="Gesture"> <combo_box label="Gestos" name="Gesture">

2
indra/newview/skins/default/xui/fr/floater_about_land.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floaterland" title="A propos du terrain"> <floater name="floaterland" title="A propos du terrain">
<tab_container name="landtab"> <tab_container name="landtab">
<panel label="Général" name="land_general_panel"> <panel label="Général" name="land_general_panel">

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

@@ -60,6 +60,9 @@
<string name="ControlYourCamera"> <string name="ControlYourCamera">
Contrôler votre caméra Contrôler votre caméra
</string> </string>
<string name="TeleportYourAgent">
Vous téléporter
</string>
<layout_stack name="panels"> <layout_stack name="panels">
<layout_panel name="im_contents_panel"> <layout_panel name="im_contents_panel">
<combo_box label="Gestures" name="Gesture"> <combo_box label="Gestures" name="Gesture">

2
indra/newview/skins/default/xui/fr/floater_directory.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="directory" title="Rechercher dans Second Life"> <floater name="directory" title="Rechercher dans Second Life">
<tab_container name="Directory Tabs"> <tab_container name="Directory Tabs">
<panel label="Tout" name="find_all_panel"> <panel label="Tout" name="find_all_panel">

2
indra/newview/skins/default/xui/fr/floater_gesture.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="gestures" title="Gestures utilisées"> <floater name="gestures" title="Gestures utilisées">
<text name="help_label"> <text name="help_label">
Double-cliquer sur une gesture pour jouer les animations Double-cliquer sur une gesture pour jouer les animations

2
indra/newview/skins/default/xui/fr/floater_inspect.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="inspect" title="Inspecter les objets"> <floater name="inspect" title="Inspecter les objets">
<scroll_list name="object_list" tool_tip="Sélectionnez un objet de la liste pour le mettre en surbrillance dans le Monde."> <scroll_list name="object_list" tool_tip="Sélectionnez un objet de la liste pour le mettre en surbrillance dans le Monde.">
<column label="Nom" name="object_name"/> <column label="Nom" name="object_name"/>

2
indra/newview/skins/default/xui/fr/floater_instant_message.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater label="(inconnue)" name="im_floater" title="(inconnue)"> <floater label="(inconnue)" name="im_floater" title="(inconnue)">
<string name="ringing"> <string name="ringing">
Appel en cours... Appel en cours...

2
indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater label="(inconnu)" name="im_floater" title="(inconnu)"> <floater label="(inconnu)" name="im_floater" title="(inconnu)">
<string name="ringing"> <string name="ringing">
En train de rejoindre le chat vocal En train de rejoindre le chat vocal

2
indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater label="(inconnu)" name="im_floater" title="(inconnu)" min_width="460"> <floater label="(inconnu)" name="im_floater" title="(inconnu)" min_width="460">
<string name="ringing"> <string name="ringing">
En train de rejoindre le chat vocal En train de rejoindre le chat vocal

2
indra/newview/skins/default/xui/fr/floater_inventory.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Inventory" title="Inventaire"> <floater name="Inventory" title="Inventaire">
<search_editor label="Saisir votre recherche ici" name="inventory search editor"/> <search_editor label="Saisir votre recherche ici" name="inventory search editor"/>
<button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center" <button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center"

2
indra/newview/skins/default/xui/fr/floater_new_im.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater label="IM" name="New IM" title="IM"> <floater label="IM" name="New IM" title="IM">
<button label="Commencer" label_selected="Commencer" name="start_btn"/> <button label="Commencer" label_selected="Commencer" name="start_btn"/>
<button label="Fermer" label_selected="Fermer" name="close_btn"/> <button label="Fermer" label_selected="Fermer" name="close_btn"/>

2
indra/newview/skins/default/xui/fr/floater_preview_animation.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="preview_anim"> <floater name="preview_anim">
<text name="desc"> <text name="desc">
Description: Description:

2
indra/newview/skins/default/xui/fr/floater_preview_sound.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="preview_sound"> <floater name="preview_sound">
<text name="desc"> <text name="desc">
Description: Description:

2
indra/newview/skins/default/xui/fr/floater_snapshot.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Snapshot" title="Prévisualiser la photo" width="247"> <floater name="Snapshot" title="Prévisualiser la photo" width="247">
<text name="type_label"> <text name="type_label">
Destination de la photo Destination de la photo

2
indra/newview/skins/default/xui/fr/floater_tools.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="toolbox floater" title="" short_title="Construire"> <floater name="toolbox floater" title="" short_title="Construire">
<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/> <button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
<button label="" label_selected="" name="button move" tool_tip="Déplacer"/> <button label="" label_selected="" name="button move" tool_tip="Déplacer"/>

2
indra/newview/skins/default/xui/fr/menu_inventory.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Popup"> <menu name="Popup">
<menu_item_call name="Task Buy" label="Acheter"/> <menu_item_call name="Task Buy" label="Acheter"/>
<menu_item_call name="Task Open" label="Ouvrir"/> <menu_item_call name="Task Open" label="Ouvrir"/>

2
indra/newview/skins/default/xui/fr/menu_mini_map.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="popup"> <menu name="popup">
<menu_item_call label="Zoom rapproché" name="Zoom Close"/> <menu_item_call label="Zoom rapproché" name="Zoom Close"/>
<menu_item_call label="Zoom moyen" name="Zoom Medium"/> <menu_item_call label="Zoom moyen" name="Zoom Medium"/>

2
indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<pie_menu name="Attachment Pie"> <pie_menu name="Attachment Pie">
<menu_item_call label="Profil" name="Profile..."/> <menu_item_call label="Profil" name="Profile..."/>
<menu_item_call label="Lâcher" name="Drop"/> <menu_item_call label="Lâcher" name="Drop"/>

2
indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<pie_menu name="Avatar Pie"> <pie_menu name="Avatar Pie">
<menu_item_call label="Profil" name="Profile..."/> <menu_item_call label="Profil" name="Profile..."/>
<menu_item_call label="Ignorer(mute)" name="Avatar Mute"/> <menu_item_call label="Ignorer(mute)" name="Avatar Mute"/>

2
indra/newview/skins/default/xui/fr/menu_pie_object.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<pie_menu name="Object Pie"> <pie_menu name="Object Pie">
<menu_item_call label="Ouvrir" name="Open"> <menu_item_call label="Ouvrir" name="Open">
<on_click function="Object.Open" /> <on_click function="Object.Open" />

2
indra/newview/skins/default/xui/fr/menu_viewer.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu"> <menu_bar name="Main Menu">
<menu label="Fichier" name="File"> <menu label="Fichier" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/> <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>

2
indra/newview/skins/default/xui/fr/notifications.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<notifications> <notifications>
<global name="skipnexttime"> <global name="skipnexttime">
Ne plus afficher Ne plus afficher

2
indra/newview/skins/default/xui/fr/panel_avatar.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Panel Avatar" width="470"> <panel name="Panel Avatar" width="470">
<tab_container name="tab" width="459"> <tab_container name="tab" width="459">
<panel label="2ème vie" name="2nd Life" width="458"> <panel label="2ème vie" name="2nd Life" width="458">

2
indra/newview/skins/default/xui/fr/panel_chat_bar.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="chat_bar"> <panel name="chat_bar">
<button label="Chat local" name="History" tool_tip="Cliquez ici pour voir ce qui a été dit"/> <button label="Chat local" name="History" tool_tip="Cliquez ici pour voir ce qui a été dit"/>
<line_editor label="Cliquez ici pour chatter." name="Chat Editor" tool_tip="Appuyez sur Entrée pour dire quelque chose, Ctrl-Entrée pour crier."/> <line_editor label="Cliquez ici pour chatter." name="Chat Editor" tool_tip="Appuyez sur Entrée pour dire quelque chose, Ctrl-Entrée pour crier."/>

2
indra/newview/skins/default/xui/fr/panel_friends.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="friends"> <panel name="friends">
<string name="Multiple"> <string name="Multiple">
Ami(e)s multiples Ami(e)s multiples

2
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="overlay"> <panel name="overlay">
<layout_stack name="overlay_layout_panel"> <layout_stack name="overlay_layout_panel">
<layout_panel min_width="410" name="main_panel" width="410"> <layout_panel min_width="410" name="main_panel" width="410">

2
indra/newview/skins/default/xui/fr/panel_place.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Place" title="Emplacement"> <panel name="Place" title="Emplacement">
<text name="name_label"> <text name="name_label">
Nom: Nom:

2
indra/newview/skins/default/xui/fr/panel_place_small.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Place" title="Lieu"> <panel name="Place" title="Lieu">
<text name="name_label"> <text name="name_label">
Nom: Nom:

2
indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan"> <panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
<tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90"> <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
<panel border="true" left="1" bottom="-190" height="180" width="500" label="Principal" name="General"> <panel border="true" left="1" bottom="-190" height="180" width="500" label="Principal" name="General">

2
indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Audio et vidéo" name="Media panel"> <panel label="Audio et vidéo" name="Media panel">
<text length="1" name="muting_text" type="string"> <text length="1" name="muting_text" type="string">
Volume : Volume :

2
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="-409" height="408" label="Général" left="102" name="general_panel" width="517"> <panel border="true" bottom="-409" height="408" label="Général" left="102" name="general_panel" width="517">
<radio_group bottom="-44" height="40" left="109" name="default_start_location" width="280"> <radio_group bottom="-44" height="40" left="109" name="default_start_location" width="280">
<radio_item bottom="-20" height="20" name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item> <radio_item bottom="-20" height="20" name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>

2
indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Graphiques" name="Display panel"> <panel label="Graphiques" name="Display panel">
<button label="?" name="GraphicsPreferencesHelpButton"/> <button label="?" name="GraphicsPreferencesHelpButton"/>
<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460"> <text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">

2
indra/newview/skins/default/xui/fr/panel_preferences_im.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Communication" name="im"> <panel label="Communication" name="im">
<text name="text_box"> <text name="text_box">
Mon statut en ligne: Mon statut en ligne:

2
indra/newview/skins/default/xui/fr/panel_preferences_input.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Contrôle caméra" name="Input panel"> <panel label="Contrôle caméra" name="Input panel">
<text name=" Mouselook Options:"> <text name=" Mouselook Options:">
Vue subjective: Vue subjective:

2
indra/newview/skins/default/xui/fr/panel_preferences_network.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Réseau" name="network"> <panel label="Réseau" name="network">
<text name="text_box"> <text name="text_box">
Bande passante maximale: Bande passante maximale:

2
indra/newview/skins/default/xui/fr/panel_preferences_skins.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- <!--
<panel label="Th&#xE8;mes" name="Skins panel"> <panel label="Th&#xE8;mes" name="Skins panel">
<text name="muting_text"> <text name="muting_text">

2
indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517"> <panel bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517">
<text bottom_delta="-20" left_delta="12" name="voice_unavailable">Le chat vocal n'est pas disponible</text> <text bottom_delta="-20" left_delta="12" name="voice_unavailable">Le chat vocal n'est pas disponible</text>
<check_box bottom_delta="0" label="Activer la voix" left="8" name="enable_voice_check"/> <check_box bottom_delta="0" label="Activer la voix" left="8" name="enable_voice_check"/>

2
indra/newview/skins/default/xui/fr/panel_preferences_web.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Web" name="web"> <panel label="Web" name="web">
<radio_group name="use_external_browser"> <radio_group name="use_external_browser">
<radio_item name="external" tool_tip="Utilisez le navigateur web du système pour l'aide, les liens web etc. Déconseillé en mode plein écran."> <radio_item name="external" tool_tip="Utilisez le navigateur web du système pour l'aide, les liens web etc. Déconseillé en mode plein écran.">

2
indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="active_speakers_panel"> <panel name="active_speakers_panel">
<string name="moderator_label"> <string name="moderator_label">
(Modérateur) (Modérateur)

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

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- This file contains strings that used to be hardcoded in the source. <!-- This file contains strings that used to be hardcoded in the source.
It is only for those strings which do not belong in a floater. It is only for those strings which do not belong in a floater.
For example, the strings used in avatar chat bubbles, and strings For example, the strings used in avatar chat bubbles, and strings

2
indra/newview/skins/default/xui/fr/teleport_strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<teleport_messages name=""> <teleport_messages name="">
<message_set name="errors"> <message_set name="errors">
<message name="invalid_tport"> <message name="invalid_tport">

2
indra/newview/skins/default/xui/fr/teleport_strings2.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<teleport_messages name=""> <teleport_messages name="">
<message_set name="errors"> <message_set name="errors">
<message name="invalid_tport"> <message name="invalid_tport">

14
scripts/clean_translation.sh
View File

@@ -3,10 +3,12 @@
SCRDIRECTORY="${0%%/*}" SCRDIRECTORY="${0%%/*}"
SAVEDIR=`pwd` SAVEDIR=`pwd`
cd $SCRDIRECTORY/../indra/newview/skins/default/xui/fr for TRANSLATION_LANGUAGE in fr es
dos2unix * do
sed -i '1 s/^\xef\xbb\xbf//' * cd $SCRDIRECTORY/../indra/newview/skins/default/xui/$TRANSLATION_LANGUAGE
chmod 644 * dos2unix *
sed -i '1 s/^\xef\xbb\xbf//' *
cd $SAVEDIR chmod 644 *
cd $SAVEDIR
done