aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llimpanel.cpp97
-rw-r--r--linden/indra/newview/llimpanel.h5
-rw-r--r--linden/indra/newview/skins/default/xui/da/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml21
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/es/floater_instant_message.xml100
-rw-r--r--linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml100
-rw-r--r--linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/it/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml2
-rwxr-xr-xlinden/indra/newview/skins/default/xui/pl/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml100
-rw-r--r--linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml2
18 files changed, 254 insertions, 195 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a5950ce..5088343 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -47,6 +47,7 @@
47#include "llbutton.h" 47#include "llbutton.h"
48#include "llcallingcard.h" 48#include "llcallingcard.h"
49#include "llchat.h" 49#include "llchat.h"
50#include "llcombobox.h"
50#include "llconsole.h" 51#include "llconsole.h"
51#include "llfloater.h" 52#include "llfloater.h"
52#include "llfloatergroupinfo.h" 53#include "llfloatergroupinfo.h"
@@ -60,6 +61,7 @@
60#include "llfloaterchat.h" 61#include "llfloaterchat.h"
61#include "llkeyboard.h" 62#include "llkeyboard.h"
62#include "lllineeditor.h" 63#include "lllineeditor.h"
64#include "llmenucommands.h"
63#include "llnotify.h" 65#include "llnotify.h"
64#include "llresmgr.h" 66#include "llresmgr.h"
65#include "lltabcontainer.h" 67#include "lltabcontainer.h"
@@ -1080,6 +1082,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
1080 LLFloater(session_label, LLRect(), session_label), 1082 LLFloater(session_label, LLRect(), session_label),
1081 mInputEditor(NULL), 1083 mInputEditor(NULL),
1082 mHistoryEditor(NULL), 1084 mHistoryEditor(NULL),
1085 mComboIM(NULL),
1083 mSessionUUID(session_id), 1086 mSessionUUID(session_id),
1084 mVoiceChannel(NULL), 1087 mVoiceChannel(NULL),
1085 mSessionInitialized(FALSE), 1088 mSessionInitialized(FALSE),
@@ -1296,7 +1299,17 @@ BOOL LLFloaterIMPanel::postBuild()
1296 mInputEditor->setRevertOnEsc( FALSE ); 1299 mInputEditor->setRevertOnEsc( FALSE );
1297 mInputEditor->setReplaceNewlinesWithSpaces( FALSE ); 1300 mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
1298 1301
1299 childSetAction("profile_callee_btn", onClickProfile, this); 1302 // Profile combobox in floater_instant_message.xml
1303 mComboIM = getChild<LLComboBox>("profile_callee_btn");
1304 mComboIM->setCommitCallback(onCommitCombo);
1305 mComboIM->setCallbackUserData(this);
1306
1307#ifdef LL_WINDOWS
1308 mComboIM->add(getString("history_entry"));
1309#endif
1310 mComboIM->add(getString("pay_entry"));
1311 mComboIM->add(getString("teleport_entry"));
1312
1300 childSetAction("group_info_btn", onClickGroupInfo, this); 1313 childSetAction("group_info_btn", onClickGroupInfo, this);
1301 childSetAction("history_btn", onClickHistory, this); 1314 childSetAction("history_btn", onClickHistory, this);
1302 1315
@@ -1304,7 +1317,6 @@ BOOL LLFloaterIMPanel::postBuild()
1304 childSetAction("end_call_btn", onClickEndCall, this); 1317 childSetAction("end_call_btn", onClickEndCall, this);
1305 childSetAction("send_btn", onClickSend, this); 1318 childSetAction("send_btn", onClickSend, this);
1306 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); 1319 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
1307 childSetAction("offer_tp_btn", onClickOfferTeleport, this);
1308 1320
1309 childSetAction("moderator_kick_speaker", onKickSpeaker, this); 1321 childSetAction("moderator_kick_speaker", onKickSpeaker, this);
1310 //LLButton* close_btn = getChild<LLButton>("close_btn"); 1322 //LLButton* close_btn = getChild<LLButton>("close_btn");
@@ -1792,26 +1804,6 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
1792} 1804}
1793 1805
1794// static 1806// static
1795void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
1796{
1797 LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
1798
1799 handle_lure(self->mOtherParticipantUUID);
1800}
1801
1802// static
1803void LLFloaterIMPanel::onClickProfile( void* userdata )
1804{
1805 // Bring up the Profile window
1806 LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
1807
1808 if (self->mOtherParticipantUUID.notNull())
1809 {
1810 LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
1811 }
1812}
1813
1814// static
1815void LLFloaterIMPanel::onClickHistory( void* userdata ) 1807void LLFloaterIMPanel::onClickHistory( void* userdata )
1816{ 1808{
1817 LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata; 1809 LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
@@ -1904,6 +1896,67 @@ void LLFloaterIMPanel::onCommitChat(LLUICtrl* caller, void* userdata)
1904} 1896}
1905 1897
1906// static 1898// static
1899void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
1900{
1901 LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
1902 LLCtrlListInterface* options = self->mComboIM ? self->mComboIM->getListInterface() : NULL;
1903 if (options)
1904 {
1905 S32 index = options->getFirstSelectedIndex();
1906 if (index < 0)
1907 {
1908 // Open profile or group window
1909 if (self->mOtherParticipantUUID.notNull())
1910 {
1911 LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
1912 }
1913 return;
1914 }
1915
1916 std::string selected = self->mComboIM->getSelectedValue().asString();
1917 if (selected == self->getString("history_entry"))
1918 {
1919 if (self->mOtherParticipantUUID.notNull())
1920 {
1921 struct stat fileInfo;
1922 int result;
1923
1924 std::string fullname = self->getTitle();;
1925 //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
1926 //if(fullname == "(Loading...)")
1927 std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
1928
1929 // check if file exists by trying to get its attributes
1930 result = stat(file_path.c_str(), &fileInfo);
1931 if(result == 0)
1932 {
1933 char command[256];
1934 sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
1935 gViewerWindow->getWindow()->ShellEx(command);
1936
1937 llinfos << command << llendl;
1938 }
1939 else
1940 {
1941 LLSD args;
1942 args["[NAME]"] = fullname;
1943 LLNotifications::instance().add("IMLogNotFound", args);
1944 llinfos << file_path << llendl;
1945 }
1946 }
1947 }
1948 else if (selected == self->getString("pay_entry"))
1949 {
1950 handle_pay_by_id(self->mOtherParticipantUUID);
1951 }
1952 else if (selected == self->getString("teleport_entry"))
1953 {
1954 handle_lure(self->mOtherParticipantUUID);
1955 }
1956 }
1957}
1958
1959// static
1907void LLFloaterIMPanel::onInputEditorFocusReceived( LLFocusableElement* caller, void* userdata ) 1960void LLFloaterIMPanel::onInputEditorFocusReceived( LLFocusableElement* caller, void* userdata )
1908{ 1961{
1909 LLFloaterIMPanel* self= (LLFloaterIMPanel*) userdata; 1962 LLFloaterIMPanel* self= (LLFloaterIMPanel*) userdata;
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index f3477bb..24f5c9b 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -47,6 +47,7 @@ class LLInventoryItem;
47class LLInventoryCategory; 47class LLInventoryCategory;
48class LLIMSpeakerMgr; 48class LLIMSpeakerMgr;
49class LLPanelActiveSpeakers; 49class LLPanelActiveSpeakers;
50class LLComboBox;
50 51
51class LLVoiceChannel : public LLVoiceClientStatusObserver 52class LLVoiceChannel : public LLVoiceClientStatusObserver
52{ 53{
@@ -228,12 +229,11 @@ public:
228 static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata); 229 static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata);
229 static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata); 230 static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
230 static void onCommitChat(LLUICtrl* caller, void* userdata); 231 static void onCommitChat(LLUICtrl* caller, void* userdata);
232 static void onCommitCombo(LLUICtrl* caller, void* userdata);
231 static void onTabClick( void* userdata ); 233 static void onTabClick( void* userdata );
232 234
233 static void onClickProfile( void* userdata );
234 static void onClickHistory( void* userdata ); 235 static void onClickHistory( void* userdata );
235 static void onClickGroupInfo( void* userdata ); 236 static void onClickGroupInfo( void* userdata );
236 static void onClickOfferTeleport( void* userdata );
237 static void onClickClose( void* userdata ); 237 static void onClickClose( void* userdata );
238 static void onClickStartCall( void* userdata ); 238 static void onClickStartCall( void* userdata );
239 static void onClickEndCall( void* userdata ); 239 static void onClickEndCall( void* userdata );
@@ -300,6 +300,7 @@ private:
300private: 300private:
301 LLLineEditor* mInputEditor; 301 LLLineEditor* mInputEditor;
302 LLViewerTextEditor* mHistoryEditor; 302 LLViewerTextEditor* mHistoryEditor;
303 LLComboBox* mComboIM;
303 304
304 // The value of the mSessionUUID depends on how the IM session was started: 305 // The value of the mSessionUUID depends on how the IM session was started:
305 // one-on-one ==> random id 306 // one-on-one ==> random id
diff --git a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
index 13a7adf..9b695b5 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Tekst chat er ikke tilgængeligt i dette opkald. 34 Tekst chat er ikke tilgængeligt i dette opkald.
35 </string> 35 </string>
36 <button label="Profil..." name="profile_callee_btn"/> 36 <flyout_button label="Profil..." name="profile_callee_btn"/>
37 <button label="Opkald" name="start_call_btn" pad_right="7" width="120"/> 37 <button label="Opkald" name="start_call_btn" pad_right="7" width="120"/>
38 <button halign="right" label="Afbryd" name="end_call_btn" width="120"/> 38 <button halign="right" label="Afbryd" name="end_call_btn" width="120"/>
39 <panel left_delta="116" name="speaker_controls"> 39 <panel left_delta="116" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 667be04..1e926c4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Für diese Verbindung ist kein Text-Chat verfügbar. 34 Für diese Verbindung ist kein Text-Chat verfügbar.
35 </string> 35 </string>
36 <button label="Profil..." name="profile_callee_btn"/> 36 <flyout_button label="Profil..." name="profile_callee_btn"/>
37 <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/> 37 <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
38 <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/> 38 <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
39 <panel left_delta="111" name="speaker_controls"> 39 <panel left_delta="111" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index be8508f..c8ec0fd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,20 +37,25 @@
37 <string name="unavailable_text_label"> 37 <string name="unavailable_text_label">
38 Text chat is not available for this call. 38 Text chat is not available for this call.
39 </string> 39 </string>
40 <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5" 40 <string name="history_entry">
41 name="profile_callee_btn" width="80" /> 41 History
42 <button bottom_delta="0" follows="left|top" font="SansSerif" 42 </string>
43 halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85" 43 <string name="pay_entry">
44 mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" /> 44 Pay
45 </string>
46 <string name="teleport_entry">
47 Offer Teleport
48 </string>
49 <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
50 list_position="below" mouse_opaque="true" name="profile_callee_btn">
51 </flyout_button>
45 <button bottom="-40" follows="left|top" halign="center" height="20" 52 <button bottom="-40" follows="left|top" halign="center" height="20"
46 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" 53 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
47 label="Call" left_delta="107" name="start_call_btn" width="100" /> 54 label="Call" left_delta="95" name="start_call_btn" width="100" />
48 <button bottom="-40" follows="left|top" halign="center" height="20" 55 <button bottom="-40" follows="left|top" halign="center" height="20"
49 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 56 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
50 label="End Call" left_delta="0" name="end_call_btn" pad_right="10" 57 label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
51 visible="false" width="100" /> 58 visible="false" width="100" />
52 <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
53 name="history_btn" visible="true" width="85" />
54 <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 59 <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right"
55 text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true" 60 text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
56 bg_visible="false" border_drop_shadow_visible="false" border_visible="false"> 61 bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 2e97d64..fd63221 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -45,10 +45,10 @@
45 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" 45 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
46 height="130" left="0" min_width="210" name="im_contents_panel" width="175"> 46 height="130" left="0" min_width="210" name="im_contents_panel" width="175">
47 <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5" 47 <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
48 name="group_info_btn" tab_group="0" width="80" /> 48 name="group_info_btn" tab_group="0" width="90" />
49 <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20" 49 <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
50 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" 50 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
51 label="Join Call" left_delta="85" name="start_call_btn" pad_right="12" 51 label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
52 width="92" /> 52 width="92" />
53 <button bottom_delta="0" follows="left|top" halign="right" height="20" 53 <button bottom_delta="0" follows="left|top" halign="right" height="20"
54 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 54 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
diff --git a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 0ba63fc..30b23d1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -1,50 +1,50 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater label="(desconocido)" name="im_floater" title="(desconocido)"> 2<floater label="(desconocido)" name="im_floater" title="(desconocido)">
3 <string name="ringing"> 3 <string name="ringing">
4 Llamando... 4 Llamando...
5 </string> 5 </string>
6 <string name="answering"> 6 <string name="answering">
7 Conectando... 7 Conectando...
8 </string> 8 </string>
9 <string name="connected"> 9 <string name="connected">
10 Conectado, pulse Colgar para acabar 10 Conectado, pulse Colgar para acabar
11 </string> 11 </string>
12 <string name="hang_up"> 12 <string name="hang_up">
13 Llamada finalizada 13 Llamada finalizada
14 </string> 14 </string>
15 <string name="inventory_item_offered"> 15 <string name="inventory_item_offered">
16 Ofrecido un ítem del inventario 16 Ofrecido un ítem del inventario
17 </string> 17 </string>
18 <string name="voice_icon"> 18 <string name="voice_icon">
19 icn_voice-pvtfocus.tga 19 icn_voice-pvtfocus.tga
20 </string> 20 </string>
21 <string name="title_string"> 21 <string name="title_string">
22 Mensaje instantáneo a [NAME] 22 Mensaje instantáneo a [NAME]
23 </string> 23 </string>
24 <string name="typing_start_string"> 24 <string name="typing_start_string">
25 [NAME] está escribiendo... 25 [NAME] está escribiendo...
26 </string> 26 </string>
27 <string name="session_start_string"> 27 <string name="session_start_string">
28 Iniciando una sesión con [NAME]; por favor, espere. 28 Iniciando una sesión con [NAME]; por favor, espere.
29 </string> 29 </string>
30 <string name="default_text_label"> 30 <string name="default_text_label">
31 Pulse aquí para enviar un mensaje instantáneo. 31 Pulse aquí para enviar un mensaje instantáneo.
32 </string> 32 </string>
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Para esta llamada no está disponible el chat de texto. 34 Para esta llamada no está disponible el chat de texto.
35 </string> 35 </string>
36 <button label="Perfil..." name="profile_callee_btn"/> 36 <flyout_button label="Perfil..." name="profile_callee_btn"/>
37 <button label="Llamar" name="start_call_btn"/> 37 <button label="Llamar" name="start_call_btn"/>
38 <button label="Colgar" name="end_call_btn"/> 38 <button label="Colgar" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
40 <button label="" name="mute_btn" tool_tip="Silenciar la voz"/> 40 <button label="" name="mute_btn" tool_tip="Silenciar la voz"/>
41 </panel> 41 </panel>
42 <line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/> 42 <line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>
43 <button label="Enviar" name="send_btn"/> 43 <button label="Enviar" name="send_btn"/>
44 <string name="live_help_dialog"> 44 <string name="live_help_dialog">
45 *** Bienvenido a la Petición de Ayuda *** 45 *** Bienvenido a la Petición de Ayuda ***
46Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/ 46Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/
47Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible. 47Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.
48-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=- 48-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
49 </string> 49 </string>
50</floater> 50</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 15539bc..926483b 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -1,50 +1,50 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater label="(inconnue)" name="im_floater" title="(inconnue)"> 2<floater label="(inconnue)" name="im_floater" title="(inconnue)">
3 <string name="ringing"> 3 <string name="ringing">
4 Appel en cours... 4 Appel en cours...
5 </string> 5 </string>
6 <string name="answering"> 6 <string name="answering">
7 Connexion en cours... 7 Connexion en cours...
8 </string> 8 </string>
9 <string name="connected"> 9 <string name="connected">
10 Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel 10 Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel
11 </string> 11 </string>
12 <string name="hang_up"> 12 <string name="hang_up">
13 Appel terminé 13 Appel terminé
14 </string> 14 </string>
15 <string name="inventory_item_offered"> 15 <string name="inventory_item_offered">
16 Objet de l&apos;inventaire offert 16 Objet de l&apos;inventaire offert
17 </string> 17 </string>
18 <string name="voice_icon"> 18 <string name="voice_icon">
19 icn_voice-pvtfocus.tga 19 icn_voice-pvtfocus.tga
20 </string> 20 </string>
21 <string name="title_string"> 21 <string name="title_string">
22 Envoyer un message instantané à [NAME] 22 Envoyer un message instantané à [NAME]
23 </string> 23 </string>
24 <string name="typing_start_string"> 24 <string name="typing_start_string">
25 [NAME] est en train d&apos;écrire… 25 [NAME] est en train d&apos;écrire…
26 </string> 26 </string>
27 <string name="session_start_string"> 27 <string name="session_start_string">
28 Début de la session avec [NAME], veuillez patienter. 28 Début de la session avec [NAME], veuillez patienter.
29 </string> 29 </string>
30 <string name="default_text_label"> 30 <string name="default_text_label">
31 Cliquez ici pour envoyer un message instantané. 31 Cliquez ici pour envoyer un message instantané.
32 </string> 32 </string>
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Le chat écrit n&apos;est pas disponible pour cet appel. 34 Le chat écrit n&apos;est pas disponible pour cet appel.
35 </string> 35 </string>
36 <button label="Profil..." name="profile_callee_btn"/> 36 <flyout_button label="Profil..." name="profile_callee_btn"/>
37 <button label="Appeler" name="start_call_btn"/> 37 <button label="Appeler" name="start_call_btn"/>
38 <button label="Raccrocher" name="end_call_btn"/> 38 <button label="Raccrocher" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
40 <button label="" name="mute_btn" tool_tip="Ignorez"/> 40 <button label="" name="mute_btn" tool_tip="Ignorez"/>
41 </panel> 41 </panel>
42 <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/> 42 <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
43 <button label="Envoyer" name="send_btn"/> 43 <button label="Envoyer" name="send_btn"/>
44 <string name="live_help_dialog"> 44 <string name="live_help_dialog">
45 *** Bienvenue sur la page Demande d&apos;aide *** 45 *** Bienvenue sur la page Demande d&apos;aide ***
46Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 46Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/
47Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 47Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde.
48-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=- 48-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
49 </string> 49 </string>
50</floater> 50</floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index e4f5892..3469323 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt. 34 Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
35 </string> 35 </string>
36 <button label="Adatlap" name="profile_callee_btn"/> 36 <flyout_button label="Adatlap" name="profile_callee_btn"/>
37 <button label="Hívás" name="start_call_btn"/> 37 <button label="Hívás" name="start_call_btn"/>
38 <button label="Hívás vége" name="end_call_btn"/> 38 <button label="Hívás vége" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
index 58e043f..7bdc046 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 La chat di testo non è disponibile in questa chiamata. 34 La chat di testo non è disponibile in questa chiamata.
35 </string> 35 </string>
36 <button label="Profilo..." name="profile_callee_btn"/> 36 <flyout_button label="Profilo..." name="profile_callee_btn"/>
37 <button label="Chiama" name="start_call_btn"/> 37 <button label="Chiama" name="start_call_btn"/>
38 <button label="Termina" name="end_call_btn"/> 38 <button label="Termina" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index a8e91e1..c9de54e 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 このコールでは文字チャットが利用できません。 34 このコールでは文字チャットが利用できません。
35 </string> 35 </string>
36 <button label="プロフィール" name="profile_callee_btn" width="100"/> 36 <flyout_button label="プロフィール" name="profile_callee_btn" width="100"/>
37 <button label="コール" left_delta="105" name="start_call_btn" width="100"/> 37 <button label="コール" left_delta="105" name="start_call_btn" width="100"/>
38 <button label="呼出終了" name="end_call_btn" width="100"/> 38 <button label="呼出終了" name="end_call_btn" width="100"/>
39 <panel left_delta="96" name="speaker_controls"> 39 <panel left_delta="96" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index 1ad7d69..f1d0a48 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
@@ -21,7 +21,7 @@
21 <string name="default_text_label"> 21 <string name="default_text_label">
22 메신저를 사용하려면 여기를 클릭하십시오. 22 메신저를 사용하려면 여기를 클릭하십시오.
23 </string> 23 </string>
24 <button label="프로필" name="profile_callee_btn" /> 24 <flyout_button label="프로필" name="profile_callee_btn" />
25 <button label="음성연결" name="start_call_btn" /> 25 <button label="음성연결" name="start_call_btn" />
26 <button label="연결종료" name="end_call_btn" /> 26 <button label="연결종료" name="end_call_btn" />
27 <panel name="speaker_controls"> 27 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
index 2851356..1d918b8 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Czat nie jest dostępny dla tej rozmowy 34 Czat nie jest dostępny dla tej rozmowy
35 </string> 35 </string>
36 <button label="Profil..." name="profile_callee_btn"/> 36 <flyout_button label="Profil..." name="profile_callee_btn"/>
37 <button label="Dzwoń" name="start_call_btn"/> 37 <button label="Dzwoń" name="start_call_btn"/>
38 <button label="Skończ" name="end_call_btn"/> 38 <button label="Skończ" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 0927cd3..983a13c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -1,50 +1,50 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater label="(desconhecido)" name="im_floater" title="(desconhecido)"> 2<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
3 <string name="ringing"> 3 <string name="ringing">
4 Chamando... 4 Chamando...
5 </string> 5 </string>
6 <string name="answering"> 6 <string name="answering">
7 Conectando... 7 Conectando...
8 </string> 8 </string>
9 <string name="connected"> 9 <string name="connected">
10 Conectado, clique Finalizar Chamada para deixar em espera 10 Conectado, clique Finalizar Chamada para deixar em espera
11 </string> 11 </string>
12 <string name="hang_up"> 12 <string name="hang_up">
13 Chamada encerrada 13 Chamada encerrada
14 </string> 14 </string>
15 <string name="inventory_item_offered"> 15 <string name="inventory_item_offered">
16 Oferecido um item de Inventário 16 Oferecido um item de Inventário
17 </string> 17 </string>
18 <string name="voice_icon"> 18 <string name="voice_icon">
19 icn_voice-pvtfocus.tga 19 icn_voice-pvtfocus.tga
20 </string> 20 </string>
21 <string name="title_string"> 21 <string name="title_string">
22 Mensagem Instantânea com [NAME] 22 Mensagem Instantânea com [NAME]
23 </string> 23 </string>
24 <string name="typing_start_string"> 24 <string name="typing_start_string">
25 [NAME] está digitando... 25 [NAME] está digitando...
26 </string> 26 </string>
27 <string name="session_start_string"> 27 <string name="session_start_string">
28 Iniciando uma sessão com [NAME]. Por favor, aguarde. 28 Iniciando uma sessão com [NAME]. Por favor, aguarde.
29 </string> 29 </string>
30 <string name="default_text_label"> 30 <string name="default_text_label">
31 Clique aqui para uma mensagem instantânea. 31 Clique aqui para uma mensagem instantânea.
32 </string> 32 </string>
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Conversa por texto não está disponível para esta chamada. 34 Conversa por texto não está disponível para esta chamada.
35 </string> 35 </string>
36 <button label="Perfil..." name="profile_callee_btn"/> 36 <flyout_button label="Perfil..." name="profile_callee_btn"/>
37 <button label="Chamar" name="start_call_btn"/> 37 <button label="Chamar" name="start_call_btn"/>
38 <button label="Terminar Chamada" name="end_call_btn"/> 38 <button label="Terminar Chamada" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
40 <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/> 40 <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
41 </panel> 41 </panel>
42 <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/> 42 <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
43 <button label="Enviar" name="send_btn"/> 43 <button label="Enviar" name="send_btn"/>
44 <string name="live_help_dialog"> 44 <string name="live_help_dialog">
45 *** Bem Vindo a Solicitação de Ajuda *** 45 *** Bem Vindo a Solicitação de Ajuda ***
46Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em 46Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em
47http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda. 47http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
48-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=- 48-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
49 </string> 49 </string>
50</floater> 50</floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
index db9e975..7aa1c19 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Текстовый чат недоступен для этого вызова. 34 Текстовый чат недоступен для этого вызова.
35 </string> 35 </string>
36 <button label="Профиль..." name="profile_callee_btn"/> 36 <flyout_button label="Профиль..." name="profile_callee_btn"/>
37 <button label="Звонок" name="start_call_btn"/> 37 <button label="Звонок" name="start_call_btn"/>
38 <button label="Конец звонка" name="end_call_btn"/> 38 <button label="Конец звонка" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
index d804a70..b627271 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Bu arama için yazılı sohbet mevcut değil. 34 Bu arama için yazılı sohbet mevcut değil.
35 </string> 35 </string>
36 <button label="Profil..." name="profile_callee_btn"/> 36 <flyout_button label="Profil..." name="profile_callee_btn"/>
37 <button label="Ara" name="start_call_btn"/> 37 <button label="Ara" name="start_call_btn"/>
38 <button label="Kapat" name="end_call_btn"/> 38 <button label="Kapat" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
index bdd51fe..60ac3b8 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
@@ -33,7 +33,7 @@
33 <string name="unavailable_text_label"> 33 <string name="unavailable_text_label">
34 Текстовий чат недоступний для цього виклику. 34 Текстовий чат недоступний для цього виклику.
35 </string> 35 </string>
36 <button label="Профіль..." name="profile_callee_btn"/> 36 <flyout_button label="Профіль..." name="profile_callee_btn"/>
37 <button label="Дзвінок" name="start_call_btn"/> 37 <button label="Дзвінок" name="start_call_btn"/>
38 <button label="Кінець дзвінка" name="end_call_btn"/> 38 <button label="Кінець дзвінка" name="end_call_btn"/>
39 <panel name="speaker_controls"> 39 <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index 70433c1..ace6d8c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -30,7 +30,7 @@
30 <string name="unavailable_text_label"> 30 <string name="unavailable_text_label">
31 本次通话不可以文字聊天。 31 本次通话不可以文字聊天。
32 </string> 32 </string>
33 <button label="档案..." name="profile_callee_btn"/> 33 <flyout_button label="档案..." name="profile_callee_btn"/>
34 <button label="呼叫" name="start_call_btn"/> 34 <button label="呼叫" name="start_call_btn"/>
35 <button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/> 35 <button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/>
36 <panel name="speaker_controls"> 36 <panel name="speaker_controls">
generated by cgit v1.1 at 2024-11-15 18:22:47 +0000