aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-07-30 17:08:24 -0700
committerMcCabe Maxsted2010-07-30 17:08:24 -0700
commitc5b42b7e783743203d08cc69ac922431cfd58e4d (patch)
tree3125fd9590c3400d87481188aaab50de4b71650b
parentDon't play typing anim when using a default channel other than 0 (diff)
downloadmeta-impy-c5b42b7e783743203d08cc69ac922431cfd58e4d.zip
meta-impy-c5b42b7e783743203d08cc69ac922431cfd58e4d.tar.gz
meta-impy-c5b42b7e783743203d08cc69ac922431cfd58e4d.tar.bz2
meta-impy-c5b42b7e783743203d08cc69ac922431cfd58e4d.tar.xz
Added option in Preferences > General for setting the default time to 12 hour/24 hour/UTC. Side effects: moved crash logger settings to advanced prefs, fixed french date translations, past/future dates and times still need to be correctly formatted
Diffstat
-rw-r--r--linden/indra/newview/CMakeLists.txt2
-rw-r--r--linden/indra/newview/app_settings/settings.xml22
-rw-r--r--linden/indra/newview/llappviewer.cpp22
-rw-r--r--linden/indra/newview/llpanelgeneral.cpp10
-rw-r--r--linden/indra/newview/llprefsadvanced.cpp8
-rw-r--r--linden/indra/newview/llstatusbar.cpp127
-rw-r--r--linden/indra/newview/llstatusbar.h9
-rw-r--r--linden/indra/newview/llviewertexteditor.cpp14
-rw-r--r--linden/indra/newview/skins/default/xui/da/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/da/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/de/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/de/strings.xml989
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml19
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml18
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/strings.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/es/panel_status_bar.xml70
-rw-r--r--linden/indra/newview/skins/default/xui/es/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/fr/strings.xml989
-rw-r--r--linden/indra/newview/skins/default/xui/hu/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/hu/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/it/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/it/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/ja/strings.xml989
-rw-r--r--linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/ko/strings.xml9
-rwxr-xr-xlinden/indra/newview/skins/default/xui/pl/panel_status_bar.xml6
-rwxr-xr-xlinden/indra/newview/skins/default/xui/pl/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml70
-rw-r--r--linden/indra/newview/skins/default/xui/pt/strings.xml981
-rw-r--r--linden/indra/newview/skins/default/xui/ru/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/ru/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/tr/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/tr/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/uk/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/uk/strings.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/zh/strings.xml9
-rw-r--r--linden/indra/newview/viewertime.cpp260
-rw-r--r--linden/indra/newview/viewertime.h88
42 files changed, 2605 insertions, 2256 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1668609..a5f2cbb 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -472,6 +472,7 @@ set(viewer_SOURCE_FILES
472 rlvmultistringsearch.cpp 472 rlvmultistringsearch.cpp
473 rlvextensions.cpp 473 rlvextensions.cpp
474 rlvfloaterbehaviour.cpp 474 rlvfloaterbehaviour.cpp
475 viewertime.cpp
475 viewerversion.cpp 476 viewerversion.cpp
476 ) 477 )
477 478
@@ -914,6 +915,7 @@ set(viewer_HEADER_FILES
914 rlvmultistringsearch.h 915 rlvmultistringsearch.h
915 rlvextensions.h 916 rlvextensions.h
916 rlvfloaterbehaviour.h 917 rlvfloaterbehaviour.h
918 viewertime.h
917 viewerversion.h 919 viewerversion.h
918 ) 920 )
919 921
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f4a88c7..a59fac6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -734,6 +734,17 @@
734 <key>Value</key> 734 <key>Value</key>
735 <string>f54a0c32-3cd1-d49a-5b4f-7b792bebc204</string> 735 <string>f54a0c32-3cd1-d49a-5b4f-7b792bebc204</string>
736 </map> 736 </map>
737 <key>Use24HourTime</key>
738 <map>
739 <key>Comment</key>
740 <string>Display time in the 24 hour format</string>
741 <key>Persist</key>
742 <integer>1</integer>
743 <key>Type</key>
744 <string>Boolean</string>
745 <key>Value</key>
746 <integer>0</integer>
747 </map>
737 <key>UseKDUIfAvailable</key> 748 <key>UseKDUIfAvailable</key>
738 <map> 749 <map>
739 <key>Comment</key> 750 <key>Comment</key>
@@ -745,6 +756,17 @@
745 <key>Value</key> 756 <key>Value</key>
746 <integer>1</integer> 757 <integer>1</integer>
747 </map> 758 </map>
759 <key>UseUTCTime</key>
760 <map>
761 <key>Comment</key>
762 <string>Display time in UTC (universal time)</string>
763 <key>Persist</key>
764 <integer>1</integer>
765 <key>Type</key>
766 <string>Boolean</string>
767 <key>Value</key>
768 <integer>0</integer>
769 </map>
748 <key>VerticalIMTabs</key> 770 <key>VerticalIMTabs</key>
749 <map> 771 <map>
750 <key>Comment</key> 772 <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c03c63d..cba1af1 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -168,7 +168,7 @@
168#include "llimview.h" 168#include "llimview.h"
169#include "llviewerthrottle.h" 169#include "llviewerthrottle.h"
170#include "llparcel.h" 170#include "llparcel.h"
171 171#include "viewertime.h"
172 172
173#include "llinventoryview.h" 173#include "llinventoryview.h"
174 174
@@ -433,6 +433,9 @@ static void settings_to_globals()
433 LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") ); 433 LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") );
434 434
435 LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt"); 435 LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt");
436
437 ViewerTime::sUse24HourTime = gSavedSettings.getBOOL("Use24HourTime");
438 ViewerTime::sUseUTCTime = gSavedSettings.getBOOL("UseUTCTime");
436} 439}
437 440
438static void settings_modify() 441static void settings_modify()
@@ -1243,6 +1246,15 @@ bool LLAppViewer::cleanup()
1243 LLWorldMap::getInstance()->reset(); // release any images 1246 LLWorldMap::getInstance()->reset(); // release any images
1244 1247
1245 LLCalc::cleanUp(); 1248 LLCalc::cleanUp();
1249
1250 delete gHippoGridManager;
1251 gHippoGridManager = NULL;
1252
1253 delete gHippoLimits;
1254 gHippoLimits = NULL;
1255
1256 delete gViewerTime;
1257 gViewerTime = NULL;
1246 1258
1247 llinfos << "Global stuff deleted" << llendflush; 1259 llinfos << "Global stuff deleted" << llendflush;
1248 1260
@@ -1457,7 +1469,7 @@ bool LLAppViewer::cleanup()
1457 } 1469 }
1458 1470
1459 // Delete workers first 1471 // Delete workers first
1460 // shotdown all worker threads before deleting them in case of co-dependencies 1472 // shutdown all worker threads before deleting them in case of co-dependencies
1461 sTextureCache->shutdown(); 1473 sTextureCache->shutdown();
1462 sTextureFetch->shutdown(); 1474 sTextureFetch->shutdown();
1463 sImageDecodeThread->shutdown(); 1475 sImageDecodeThread->shutdown();
@@ -2297,6 +2309,12 @@ bool LLAppViewer::initWindow()
2297 LLTrans::parseStrings("strings.xml"); 2309 LLTrans::parseStrings("strings.xml");
2298 LLUITrans::parseStrings("ui_strings.xml"); 2310 LLUITrans::parseStrings("ui_strings.xml");
2299 2311
2312 // Start up the viewer's clock -- MC
2313 if (!gViewerTime)
2314 {
2315 gViewerTime = new ViewerTime();
2316 }
2317
2300 // Show watch cursor 2318 // Show watch cursor
2301 gViewerWindow->setCursor(UI_CURSOR_WAIT); 2319 gViewerWindow->setCursor(UI_CURSOR_WAIT);
2302 2320
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 07c81fd..14b3dc1 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -46,6 +46,7 @@
46#include "llagent.h" 46#include "llagent.h"
47#include "llpanellogin.h" 47#include "llpanellogin.h"
48#include "llviewerregion.h" 48#include "llviewerregion.h"
49#include "viewertime.h"
49 50
50LLPanelGeneral::LLPanelGeneral() 51LLPanelGeneral::LLPanelGeneral()
51{ 52{
@@ -100,8 +101,8 @@ BOOL LLPanelGeneral::postBuild()
100 childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor")); 101 childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor"));
101 childSetValue("ui_auto_scale", gSavedSettings.getBOOL("UIAutoScale")); 102 childSetValue("ui_auto_scale", gSavedSettings.getBOOL("UIAutoScale"));
102 103
103 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox"); 104 LLComboBox* time_combobox = getChild<LLComboBox>("time_combobox");
104 crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING)); 105 time_combobox->setCurrentByIndex(gSavedSettings.getU32("TimeFormat"));
105 106
106 childSetValue("language_combobox", gSavedSettings.getString("Language")); 107 childSetValue("language_combobox", gSavedSettings.getString("Language"));
107 108
@@ -171,8 +172,9 @@ void LLPanelGeneral::apply()
171 gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale")); 172 gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
172 gSavedSettings.setString("Language", childGetValue("language_combobox")); 173 gSavedSettings.setString("Language", childGetValue("language_combobox"));
173 174
174 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox"); 175 LLComboBox* time_combobox = getChild<LLComboBox>("time_combobox");
175 gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex()); 176 gSavedSettings.setU32("TimeFormat", time_combobox->getCurrentIndex());
177 gViewerTime->updateTimeFormat(time_combobox->getCurrentIndex());
176 178
177 // if we have no agent, we can't let them choose anything 179 // if we have no agent, we can't let them choose anything
178 // if we have an agent, then we only let them choose if they have a choice 180 // if we have an agent, then we only let them choose if they have a choice
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 9429d2d..6489f52 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -30,6 +30,8 @@
30 30
31#include "llviewerprecompiledheaders.h" 31#include "llviewerprecompiledheaders.h"
32 32
33#include "llcombobox.h"
34
33#include "llagent.h" 35#include "llagent.h"
34#include "llprefsadvanced.h" 36#include "llprefsadvanced.h"
35#include "llviewercontrol.h" 37#include "llviewercontrol.h"
@@ -65,6 +67,9 @@ BOOL LLPrefsAdvanced::postBuild()
65 childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled")); 67 childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
66 childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic")); 68 childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
67 69
70 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
71 crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
72
68 refresh(); 73 refresh();
69 74
70 return TRUE; 75 return TRUE;
@@ -139,6 +144,9 @@ void LLPrefsAdvanced::apply()
139 gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox")); 144 gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
140 build_pie_menus(); 145 build_pie_menus();
141 } 146 }
147
148 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
149 gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
142} 150}
143 151
144void LLPrefsAdvanced::cancel() 152void LLPrefsAdvanced::cancel()
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 3bd30cc..366363b 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -83,11 +83,8 @@
83#include "llstring.h" 83#include "llstring.h"
84#include "message.h" 84#include "message.h"
85 85
86// system includes
87#include <iomanip>
88
89
90#include "hippoGridManager.h" 86#include "hippoGridManager.h"
87#include "viewertime.h"
91 88
92// 89//
93// Globals 90// Globals
@@ -121,10 +118,6 @@ static void onClickScripts(void*);
121static void onClickBuyLand(void*); 118static void onClickBuyLand(void*);
122static void onClickScriptDebug(void*); 119static void onClickScriptDebug(void*);
123 120
124std::vector<std::string> LLStatusBar::sDays;
125std::vector<std::string> LLStatusBar::sMonths;
126const U32 LLStatusBar::MAX_DATE_STRING_LENGTH = 2000;
127
128LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect) 121LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
129: LLPanel(name, LLRect(), FALSE), // not mouse opaque 122: LLPanel(name, LLRect(), FALSE), // not mouse opaque
130mBalance(0), 123mBalance(0),
@@ -136,10 +129,6 @@ mSquareMetersCommitted(0)
136 setMouseOpaque(FALSE); 129 setMouseOpaque(FALSE);
137 setIsChrome(TRUE); 130 setIsChrome(TRUE);
138 131
139 // size of day of the weeks and year
140 sDays.reserve(7);
141 sMonths.reserve(12);
142
143 mBalanceTimer = new LLFrameTimer(); 132 mBalanceTimer = new LLFrameTimer();
144 mHealthTimer = new LLFrameTimer(); 133 mHealthTimer = new LLFrameTimer();
145 134
@@ -148,9 +137,6 @@ mSquareMetersCommitted(0)
148 // status bar can never get a tab 137 // status bar can never get a tab
149 setFocusRoot(FALSE); 138 setFocusRoot(FALSE);
150 139
151 // build date necessary data (must do after panel built)
152 setupDate();
153
154 mTextParcelName = getChild<LLTextBox>("ParcelNameText" ); 140 mTextParcelName = getChild<LLTextBox>("ParcelNameText" );
155 mTextBalance = getChild<LLTextBox>("BalanceText" ); 141 mTextBalance = getChild<LLTextBox>("BalanceText" );
156 142
@@ -265,50 +251,10 @@ void LLStatusBar::refresh()
265 mSGBandwidth->setThreshold(1, bwtotal); 251 mSGBandwidth->setThreshold(1, bwtotal);
266 mSGBandwidth->setThreshold(2, bwtotal); 252 mSGBandwidth->setThreshold(2, bwtotal);
267 253
268 // *TODO: Localize / translate time 254 // Let's not have to reformat time everywhere, shall we? -- MC
269 255 gViewerTime->refresh();
270 // Get current UTC time, adjusted for the user's clock 256 mTextTime->setText(gViewerTime->getCurTimeStr());
271 // being off. 257 mTextTime->setToolTip(gViewerTime->getCurDateStr());
272 time_t utc_time;
273 utc_time = time_corrected();
274
275 // There's only one internal tm buffer.
276 struct tm* internal_time;
277
278 // Convert to Pacific, based on server's opinion of whether
279 // it's daylight savings time there.
280 internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
281
282 S32 hour = internal_time->tm_hour;
283 S32 min = internal_time->tm_min;
284
285 std::string am_pm = "AM";
286 if (hour > 11)
287 {
288 hour -= 12;
289 am_pm = "PM";
290 }
291
292 std::string tz = "PST";
293 if (gPacificDaylightTime)
294 {
295 tz = "PDT";
296 }
297 // Zero hour is 12 AM
298 if (hour == 0) hour = 12;
299 std::ostringstream t;
300 t << std::setfill(' ') << std::setw(2) << hour << ":"
301 << std::setfill('0') << std::setw(2) << min
302 << " " << am_pm << " " << tz;
303 mTextTime->setText(t.str());
304
305 // Year starts at 1900, set the tooltip to have the date
306 std::ostringstream date;
307 date << sDays[internal_time->tm_wday] << ", "
308 << std::setfill('0') << std::setw(2) << internal_time->tm_mday << " "
309 << sMonths[internal_time->tm_mon] << " "
310 << internal_time->tm_year + 1900;
311 mTextTime->setToolTip(date.str());
312 258
313 LLRect r; 259 LLRect r;
314 const S32 MENU_RIGHT = gMenuBarView->getRightmostMenuEdge(); 260 const S32 MENU_RIGHT = gMenuBarView->getRightmostMenuEdge();
@@ -877,69 +823,6 @@ static void onClickBuyLand(void*)
877 LLViewerParcelMgr::getInstance()->startBuyLand(); 823 LLViewerParcelMgr::getInstance()->startBuyLand();
878} 824}
879 825
880// sets the static variables necessary for the date
881void LLStatusBar::setupDate()
882{
883 // fill the day array with what's in the xui
884 std::string day_list = getString("StatBarDaysOfWeek");
885 size_t length = day_list.size();
886
887 // quick input check
888 if(length < MAX_DATE_STRING_LENGTH)
889 {
890 // tokenize it and put it in the array
891 std::string cur_word;
892 for(size_t i = 0; i < length; ++i)
893 {
894 if(day_list[i] == ':')
895 {
896 sDays.push_back(cur_word);
897 cur_word.clear();
898 }
899 else
900 {
901 cur_word.append(1, day_list[i]);
902 }
903 }
904 sDays.push_back(cur_word);
905 }
906
907 // fill the day array with what's in the xui
908 std::string month_list = getString( "StatBarMonthsOfYear" );
909 length = month_list.size();
910
911 // quick input check
912 if(length < MAX_DATE_STRING_LENGTH)
913 {
914 // tokenize it and put it in the array
915 std::string cur_word;
916 for(size_t i = 0; i < length; ++i)
917 {
918 if(month_list[i] == ':')
919 {
920 sMonths.push_back(cur_word);
921 cur_word.clear();
922 }
923 else
924 {
925 cur_word.append(1, month_list[i]);
926 }
927 }
928 sMonths.push_back(cur_word);
929 }
930
931 // make sure we have at least 7 days and 12 months
932 if(sDays.size() < 7)
933 {
934 sDays.resize(7);
935 }
936
937 if(sMonths.size() < 12)
938 {
939 sMonths.resize(12);
940 }
941}
942
943// static 826// static
944void LLStatusBar::onCommitSearch(LLUICtrl*, void* data) 827void LLStatusBar::onCommitSearch(LLUICtrl*, void* data)
945{ 828{
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index 8e71f75..92be319 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -47,6 +47,7 @@ class LLUICtrl;
47class LLUUID; 47class LLUUID;
48class LLFrameTimer; 48class LLFrameTimer;
49class LLStatGraph; 49class LLStatGraph;
50class ViewerTime;
50 51
51// used by LCD screen 52// used by LCD screen
52class LLRegionDetails 53class LLRegionDetails
@@ -122,9 +123,6 @@ public:
122 LLRegionDetails mRegionDetails; 123 LLRegionDetails mRegionDetails;
123 124
124private: 125private:
125 // simple method to setup the part that holds the date
126 void setupDate();
127
128 static void onCommitSearch(LLUICtrl*, void* data); 126 static void onCommitSearch(LLUICtrl*, void* data);
129 static void onClickSearch(void* data); 127 static void onClickSearch(void* data);
130 static void onClickStatGraph(void* data); 128 static void onClickStatGraph(void* data);
@@ -147,10 +145,7 @@ private:
147 S32 mSquareMetersCommitted; 145 S32 mSquareMetersCommitted;
148 LLFrameTimer* mBalanceTimer; 146 LLFrameTimer* mBalanceTimer;
149 LLFrameTimer* mHealthTimer; 147 LLFrameTimer* mHealthTimer;
150 148 ViewerTime* mViewerTime;
151 static std::vector<std::string> sDays;
152 static std::vector<std::string> sMonths;
153 static const U32 MAX_DATE_STRING_LENGTH;
154}; 149};
155 150
156// *HACK: Status bar owns your cached money balance. JC 151// *HACK: Status bar owns your cached money balance. JC
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 832fdd6..4caf257 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -61,6 +61,7 @@
61#include "llmenugl.h" 61#include "llmenugl.h"
62 62
63#include "llappviewer.h" // for gPacificDaylightTime 63#include "llappviewer.h" // for gPacificDaylightTime
64#include "viewertime.h"
64 65
65static LLRegisterWidget<LLViewerTextEditor> r("text_editor"); 66static LLRegisterWidget<LLViewerTextEditor> r("text_editor");
66 67
@@ -1251,7 +1252,8 @@ std::string LLViewerTextEditor::getEmbeddedText()
1251 1252
1252std::string LLViewerTextEditor::appendTime(bool prepend_newline) 1253std::string LLViewerTextEditor::appendTime(bool prepend_newline)
1253{ 1254{
1254 time_t utc_time; 1255 // Format time according to the person's settings -- MC
1256 /*time_t utc_time;
1255 utc_time = time_corrected(); 1257 utc_time = time_corrected();
1256 1258
1257 // There's only one internal tm buffer. 1259 // There's only one internal tm buffer.
@@ -1261,7 +1263,15 @@ std::string LLViewerTextEditor::appendTime(bool prepend_newline)
1261 // it's daylight savings time there. 1263 // it's daylight savings time there.
1262 timep = utc_to_pacific_time(utc_time, gPacificDaylightTime); 1264 timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
1263 1265
1264 std::string text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min); 1266 text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min);
1267 appendColoredText(text, false, prepend_newline, LLColor4::grey);*/
1268 std::string text = llformat("[%02d:%02d", gViewerTime->getCurHour(), gViewerTime->getCurMin());
1269 if (!gViewerTime->getCurAMPM().empty())
1270 {
1271 text += " ";
1272 text += gViewerTime->getCurAMPM();
1273 }
1274 text += "] ";
1265 appendColoredText(text, false, prepend_newline, LLColor4::grey); 1275 appendColoredText(text, false, prepend_newline, LLColor4::grey);
1266 1276
1267 return text; 1277 return text;
diff --git a/linden/indra/newview/skins/default/xui/da/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 7bc66b1..8088f54 100644
--- a/linden/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/da/panel_status_bar.xml
@@ -11,12 +11,6 @@
11 <text type="string" length="12" name="TimeText" tool_tip="Nuværende Second Life tid"> 11 <text type="string" length="12" name="TimeText" tool_tip="Nuværende Second Life tid">
12 12:00 12 12:00
13 </text> 13 </text>
14 <string name="StatBarDaysOfWeek">
15 Søndag:Mandag:Tirsdag:Onsdag:Torsdag:Fredag:Lørdag
16 </string>
17 <string name="StatBarMonthsOfYear">
18 Januar:Februar:Marts:April:Maj:Juni:Juli:August:September:Oktober:November:December
19 </string>
20 <button label="" label_selected="" name="scriptout" tool_tip="Script advarsler og fejl" /> 14 <button label="" label_selected="" name="scriptout" tool_tip="Script advarsler og fejl" />
21 <button label="" label_selected="" name="health" tool_tip="Helbred" /> 15 <button label="" label_selected="" name="health" tool_tip="Helbred" />
22 <text type="string" length="1" name="HealthText" tool_tip="Helbred"> 16 <text type="string" length="1" name="HealthText" tool_tip="Helbred">
diff --git a/linden/indra/newview/skins/default/xui/da/strings.xml b/linden/indra/newview/skins/default/xui/da/strings.xml
index 79ebbc3..7a64666 100644
--- a/linden/indra/newview/skins/default/xui/da/strings.xml
+++ b/linden/indra/newview/skins/default/xui/da/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Søndag:Mandag:Tirsdag:Onsdag:Torsdag:Fredag:Lørdag
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Januar:Februar:Marts:April:Maj:Juni:Juli:August:September:Oktober:November:December
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Logger p. [APP_NAME] kan virke laast. Vent venligst. 17 Logger p. [APP_NAME] kan virke laast. Vent venligst.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index adfe387..565e6b8 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string"> 10 <text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
11 12:00 11 12:00
12 </text> 12 </text>
13 <text name="StatBarDaysOfWeek">
14 Sonntag:Montag:Dienstag:Mittwoch:Donnerstag:Freitag:Samstag
15 </text>
16 <text name="StatBarMonthsOfYear">
17 Januar:Februar:März:April:Mai:Juni:Juli:August:September:Oktober:November:Dezember
18 </text>
19 <button label="" label_selected="" name="scriptout" tool_tip="Skriptwarnungen und -fehler"/> 13 <button label="" label_selected="" name="scriptout" tool_tip="Skriptwarnungen und -fehler"/>
20 <button label="" label_selected="" name="health" tool_tip="Gesundheit"/> 14 <button label="" label_selected="" name="health" tool_tip="Gesundheit"/>
21 <text length="1" name="HealthText" tool_tip="Gesundheit" type="string"> 15 <text length="1" name="HealthText" tool_tip="Gesundheit" type="string">
diff --git a/linden/indra/newview/skins/default/xui/de/strings.xml b/linden/indra/newview/skins/default/xui/de/strings.xml
index b5ee1b6..f692f9e 100644
--- a/linden/indra/newview/skins/default/xui/de/strings.xml
+++ b/linden/indra/newview/skins/default/xui/de/strings.xml
@@ -1,490 +1,499 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<!-- This file contains strings that used to be hardcoded in the source. 2<!-- This file contains strings that used to be hardcoded in the source.
3 It is only for those strings which do not belong in a floater. 3 It is only for those strings which do not belong in a floater.
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7 <string name="LoginInProgress"> 7
8 Anmeldevorgang gestartet. [APP_NAME] reagiert möglicherweise nicht. Bitte warten. 8 <!-- Imprudence-specific strings -->
9 </string> 9 <text name="StatBarDaysOfWeek">
10 <string name="LoginAuthenticating"> 10 Sonntag:Montag:Dienstag:Mittwoch:Donnerstag:Freitag:Samstag
11 Authentifizierung 11 </text>
12 </string> 12 <text name="StatBarMonthsOfYear">
13 <string name="LoginMaintenance"> 13 Januar:Februar:März:April:Mai:Juni:Juli:August:September:Oktober:November:Dezember
14 Account wird aktualisiert... 14 </text>
15 </string> 15
16 <string name="LoginAttempt"> 16 <string name="LoginInProgress">
17 Ein früherer Anmeldeversuch ist fehlgeschlagen. Anmeldung, Versuch [NUMBER] 17 Anmeldevorgang gestartet. [APP_NAME] reagiert möglicherweise nicht. Bitte warten.
18 </string> 18 </string>
19 <string name="LoginPrecaching"> 19 <string name="LoginAuthenticating">
20 Welt wird geladen... 20 Authentifizierung
21 </string> 21 </string>
22 <string name="LoginInitializingBrowser"> 22 <string name="LoginMaintenance">
23 Integrierter Webbrowser wird initialisiert... 23 Account wird aktualisiert...
24 </string> 24 </string>
25 <string name="LoginInitializingMultimedia"> 25 <string name="LoginAttempt">
26 Multimedia wird initialisiert... 26 Ein früherer Anmeldeversuch ist fehlgeschlagen. Anmeldung, Versuch [NUMBER]
27 </string> 27 </string>
28 <string name="LoginVerifyingCache"> 28 <string name="LoginPrecaching">
29 Cache-Dateien werden überprüft (dauert 60-90 Sekunden)... 29 Welt wird geladen...
30 </string> 30 </string>
31 <string name="LoginProcessingResponse"> 31 <string name="LoginInitializingBrowser">
32 Antwort wird verarbeitet... 32 Integrierter Webbrowser wird initialisiert...
33 </string> 33 </string>
34 <string name="LoginInitializingWorld"> 34 <string name="LoginInitializingMultimedia">
35 Welt wird initialisiert... 35 Multimedia wird initialisiert...
36 </string> 36 </string>
37 <string name="LoginDecodingImages"> 37 <string name="LoginVerifyingCache">
38 Bilder werden entpackt... 38 Cache-Dateien werden überprüft (dauert 60-90 Sekunden)...
39 </string> 39 </string>
40 <string name="LoginInitializingQuicktime"> 40 <string name="LoginProcessingResponse">
41 QuickTime wird initialisiert... 41 Antwort wird verarbeitet...
42 </string> 42 </string>
43 <string name="LoginQuicktimeNotFound"> 43 <string name="LoginInitializingWorld">
44 QuickTime nicht gefunden - Initialisierung nicht möglich. 44 Welt wird initialisiert...
45 </string> 45 </string>
46 <string name="LoginQuicktimeOK"> 46 <string name="LoginDecodingImages">
47 QuickTime wurde initialisiert. 47 Bilder werden entpackt...
48 </string> 48 </string>
49 <string name="LoginWaitingForRegionHandshake"> 49 <string name="LoginInitializingQuicktime">
50 Region-Handshake... 50 QuickTime wird initialisiert...
51 </string> 51 </string>
52 <string name="LoginConnectingToRegion"> 52 <string name="LoginQuicktimeNotFound">
53 Region-Verbindung... 53 QuickTime nicht gefunden - Initialisierung nicht möglich.
54 </string> 54 </string>
55 <string name="LoginDownloadingClothing"> 55 <string name="LoginQuicktimeOK">
56 Kleidung wird geladen... 56 QuickTime wurde initialisiert.
57 </string> 57 </string>
58 <string name="AgentLostConnection"> 58 <string name="LoginWaitingForRegionHandshake">
59 In dieser Region kann es zu Problemen kommen. Bitte überprüfen Sie Ihre Internetverbindung. 59 Region-Handshake...
60 </string> 60 </string>
61 <string name="TooltipPerson"> 61 <string name="LoginConnectingToRegion">
62 Person 62 Region-Verbindung...
63 </string> 63 </string>
64 <string name="TooltipNoName"> 64 <string name="LoginDownloadingClothing">
65 (namenlos) 65 Kleidung wird geladen...
66 </string> 66 </string>
67 <string name="TooltipOwner"> 67 <string name="AgentLostConnection">
68 Eigentümer: 68 In dieser Region kann es zu Problemen kommen. Bitte überprüfen Sie Ihre Internetverbindung.
69 </string> 69 </string>
70 <string name="TooltipPublic"> 70 <string name="TooltipPerson">
71 Öffentlich 71 Person
72 </string> 72 </string>
73 <string name="TooltipIsGroup"> 73 <string name="TooltipNoName">
74 (Gruppe) 74 (namenlos)
75 </string> 75 </string>
76 <string name="TooltipFlagScript"> 76 <string name="TooltipOwner">
77 Skript 77 Eigentümer:
78 </string> 78 </string>
79 <string name="TooltipFlagPhysics"> 79 <string name="TooltipPublic">
80 Physik 80 Öffentlich
81 </string> 81 </string>
82 <string name="TooltipFlagTouch"> 82 <string name="TooltipIsGroup">
83 Berühren 83 (Gruppe)
84 </string> 84 </string>
85 <string name="TooltipFlagL$"> 85 <string name="TooltipFlagScript">
86 L$ 86 Skript
87 </string> 87 </string>
88 <string name="TooltipFlagDropInventory"> 88 <string name="TooltipFlagPhysics">
89 Inventar fallen lassen 89 Physik
90 </string> 90 </string>
91 <string name="TooltipFlagPhantom"> 91 <string name="TooltipFlagTouch">
92 Phantom 92 Berühren
93 </string> 93 </string>
94 <string name="TooltipFlagTemporary"> 94 <string name="TooltipFlagL$">
95 Temporär 95 L$
96 </string> 96 </string>
97 <string name="TooltipFlagRightClickMenu"> 97 <string name="TooltipFlagDropInventory">
98 (Rechtsklick für Menü) 98 Inventar fallen lassen
99 </string> 99 </string>
100 <string name="TooltipFreeToCopy"> 100 <string name="TooltipFlagPhantom">
101 Kopieren möglich 101 Phantom
102 </string> 102 </string>
103 <string name="TooltipForSaleL$"> 103 <string name="TooltipFlagTemporary">
104 Zum Verkauf: [AMOUNT] L$ 104 Temporär
105 </string> 105 </string>
106 <string name="TooltipForSaleMsg"> 106 <string name="TooltipFlagRightClickMenu">
107 Zum Verkauf: [MESSAGE] 107 (Rechtsklick für Menü)
108 </string> 108 </string>
109 <string name="TooltipFlagGroupBuild"> 109 <string name="TooltipFreeToCopy">
110 Gruppenbau 110 Kopieren möglich
111 </string> 111 </string>
112 <string name="TooltipFlagNoBuild"> 112 <string name="TooltipForSaleL$">
113 Bauen aus 113 Zum Verkauf: [AMOUNT] L$
114 </string> 114 </string>
115 <string name="TooltipFlagNoEdit"> 115 <string name="TooltipForSaleMsg">
116 Gruppenbau 116 Zum Verkauf: [MESSAGE]
117 </string> 117 </string>
118 <string name="TooltipFlagNotSafe"> 118 <string name="TooltipFlagGroupBuild">
119 Unsicher 119 Gruppenbau
120 </string> 120 </string>
121 <string name="TooltipFlagNoFly"> 121 <string name="TooltipFlagNoBuild">
122 Fliegen aus 122 Bauen aus
123 </string> 123 </string>
124 <string name="TooltipFlagGroupScripts"> 124 <string name="TooltipFlagNoEdit">
125 Gruppenskripte 125 Gruppenbau
126 </string> 126 </string>
127 <string name="TooltipFlagNoScripts"> 127 <string name="TooltipFlagNotSafe">
128 Skripte aus 128 Unsicher
129 </string> 129 </string>
130 <string name="TooltipLand"> 130 <string name="TooltipFlagNoFly">
131 Land: 131 Fliegen aus
132 </string> 132 </string>
133 <string name="TooltipMustSingleDrop"> 133 <string name="TooltipFlagGroupScripts">
134 Sie können nur ein einzelnes Objekt hierher ziehen 134 Gruppenskripte
135 </string> 135 </string>
136 <string name="RetrievingData"> 136 <string name="TooltipFlagNoScripts">
137 Laden... 137 Skripte aus
138 </string> 138 </string>
139 <string name="ReleaseNotes"> 139 <string name="TooltipLand">
140 Versionshinweise 140 Land:
141 </string> 141 </string>
142 <string name="LoadingData"> 142 <string name="TooltipMustSingleDrop">
143 Wird geladen... 143 Sie können nur ein einzelnes Objekt hierher ziehen
144 </string> 144 </string>
145 <string name="AvatarNameNobody"> 145 <string name="RetrievingData">
146 (niemand) 146 Laden...
147 </string> 147 </string>
148 <string name="AvatarNameWaiting"> 148 <string name="ReleaseNotes">
149 (wartet) 149 Versionshinweise
150 </string> 150 </string>
151 <string name="AvatarNameHippos"> 151 <string name="LoadingData">
152 (hippos) 152 Wird geladen...
153 </string> 153 </string>
154 <string name="GroupNameNone"> 154 <string name="AvatarNameNobody">
155 (keiner) 155 (niemand)
156 </string> 156 </string>
157 <string name="AssetErrorNone"> 157 <string name="AvatarNameWaiting">
158 Kein Fehler 158 (wartet)
159 </string> 159 </string>
160 <string name="AssetErrorRequestFailed"> 160 <string name="AvatarNameHippos">
161 Asset-Anforderung: fehlgeschlagen 161 (hippos)
162 </string> 162 </string>
163 <string name="AssetErrorNonexistentFile"> 163 <string name="GroupNameNone">
164 Asset-Anforderung: Datei existiert nicht 164 (keiner)
165 </string> 165 </string>
166 <string name="AssetErrorNotInDatabase"> 166 <string name="AssetErrorNone">
167 Asset-Anforderung: Asset in Datenbank nicht gefunden 167 Kein Fehler
168 </string> 168 </string>
169 <string name="AssetErrorEOF"> 169 <string name="AssetErrorRequestFailed">
170 Ende der Datei 170 Asset-Anforderung: fehlgeschlagen
171 </string> 171 </string>
172 <string name="AssetErrorCannotOpenFile"> 172 <string name="AssetErrorNonexistentFile">
173 Datei kann nicht geöffnet werden 173 Asset-Anforderung: Datei existiert nicht
174 </string> 174 </string>
175 <string name="AssetErrorFileNotFound"> 175 <string name="AssetErrorNotInDatabase">
176 Datei nicht gefunden 176 Asset-Anforderung: Asset in Datenbank nicht gefunden
177 </string> 177 </string>
178 <string name="AssetErrorTCPTimeout"> 178 <string name="AssetErrorEOF">
179 Zeitüberschreitung bei Dateiübertragung 179 Ende der Datei
180 </string> 180 </string>
181 <string name="AssetErrorCircuitGone"> 181 <string name="AssetErrorCannotOpenFile">
182 Verbindung verloren 182 Datei kann nicht geöffnet werden
183 </string> 183 </string>
184 <string name="AssetErrorPriceMismatch"> 184 <string name="AssetErrorFileNotFound">
185 Viewer und Server sind sich nicht über Preis einig 185 Datei nicht gefunden
186 </string> 186 </string>
187 <string name="AssetErrorUnknownStatus"> 187 <string name="AssetErrorTCPTimeout">
188 Status unbekannt 188 Zeitüberschreitung bei Dateiübertragung
189 </string> 189 </string>
190 <string name="AvatarEditingApparance"> 190 <string name="AssetErrorCircuitGone">
191 (Aussehen wird bearbeitet) 191 Verbindung verloren
192 </string> 192 </string>
193 <string name="AvatarAway"> 193 <string name="AssetErrorPriceMismatch">
194 Abwesend 194 Viewer und Server sind sich nicht über Preis einig
195 </string> 195 </string>
196 <string name="AvatarBusy"> 196 <string name="AssetErrorUnknownStatus">
197 Beschäftigt 197 Status unbekannt
198 </string> 198 </string>
199 <string name="AvatarMuted"> 199 <string name="AvatarEditingApparance">
200 Stummgeschaltet 200 (Aussehen wird bearbeitet)
201 </string> 201 </string>
202 <string name="anim_express_afraid"> 202 <string name="AvatarAway">
203 Ängstlich 203 Abwesend
204 </string> 204 </string>
205 <string name="anim_express_anger"> 205 <string name="AvatarBusy">
206 Verärgert 206 Beschäftigt
207 </string> 207 </string>
208 <string name="anim_away"> 208 <string name="AvatarMuted">
209 Abwesend 209 Stummgeschaltet
210 </string> 210 </string>
211 <string name="anim_backflip"> 211 <string name="anim_express_afraid">
212 Rückwärtssalto 212 Ängstlich
213 </string> 213 </string>
214 <string name="anim_express_laugh"> 214 <string name="anim_express_anger">
215 Lachkrampf 215 Verärgert
216 </string> 216 </string>
217 <string name="anim_express_toothsmile"> 217 <string name="anim_away">
218 Grinsen 218 Abwesend
219 </string> 219 </string>
220 <string name="anim_blowkiss"> 220 <string name="anim_backflip">
221 Kusshand 221 Rückwärtssalto
222 </string> 222 </string>
223 <string name="anim_express_bored"> 223 <string name="anim_express_laugh">
224 Gelangweilt 224 Lachkrampf
225 </string> 225 </string>
226 <string name="anim_bow"> 226 <string name="anim_express_toothsmile">
227 Verbeugen 227 Grinsen
228 </string> 228 </string>
229 <string name="anim_clap"> 229 <string name="anim_blowkiss">
230 Klatschen 230 Kusshand
231 </string> 231 </string>
232 <string name="anim_courtbow"> 232 <string name="anim_express_bored">
233 Diener 233 Gelangweilt
234 </string> 234 </string>
235 <string name="anim_express_cry"> 235 <string name="anim_bow">
236 Weinen 236 Verbeugen
237 </string> 237 </string>
238 <string name="anim_dance1"> 238 <string name="anim_clap">
239 Tanz 1 239 Klatschen
240 </string> 240 </string>
241 <string name="anim_dance2"> 241 <string name="anim_courtbow">
242 Tanz 2 242 Diener
243 </string> 243 </string>
244 <string name="anim_dance3"> 244 <string name="anim_express_cry">
245 Tanz 3 245 Weinen
246 </string> 246 </string>
247 <string name="anim_dance4"> 247 <string name="anim_dance1">
248 Tanz 4 248 Tanz 1
249 </string> 249 </string>
250 <string name="anim_dance5"> 250 <string name="anim_dance2">
251 Tanz 5 251 Tanz 2
252 </string> 252 </string>
253 <string name="anim_dance6"> 253 <string name="anim_dance3">
254 Tanz 6 254 Tanz 3
255 </string> 255 </string>
256 <string name="anim_dance7"> 256 <string name="anim_dance4">
257 Tanz 7 257 Tanz 4
258 </string> 258 </string>
259 <string name="anim_dance8"> 259 <string name="anim_dance5">
260 Tanz 8 260 Tanz 5
261 </string> 261 </string>
262 <string name="anim_express_disdain"> 262 <string name="anim_dance6">
263 Verachten 263 Tanz 6
264 </string> 264 </string>
265 <string name="anim_drink"> 265 <string name="anim_dance7">
266 Trinken 266 Tanz 7
267 </string> 267 </string>
268 <string name="anim_express_embarrased"> 268 <string name="anim_dance8">
269 Verlegen 269 Tanz 8
270 </string> 270 </string>
271 <string name="anim_angry_fingerwag"> 271 <string name="anim_express_disdain">
272 Drohen 272 Verachten
273 </string> 273 </string>
274 <string name="anim_fist_pump"> 274 <string name="anim_drink">
275 Faust pumpen 275 Trinken
276 </string> 276 </string>
277 <string name="anim_yoga_float"> 277 <string name="anim_express_embarrased">
278 Yogaflieger 278 Verlegen
279 </string> 279 </string>
280 <string name="anim_express_frown"> 280 <string name="anim_angry_fingerwag">
281 Stirnrunzeln 281 Drohen
282 </string> 282 </string>
283 <string name="anim_impatient"> 283 <string name="anim_fist_pump">
284 Ungeduldig 284 Faust pumpen
285 </string> 285 </string>
286 <string name="anim_jumpforjoy"> 286 <string name="anim_yoga_float">
287 Freudensprung 287 Yogaflieger
288 </string> 288 </string>
289 <string name="anim_kissmybutt"> 289 <string name="anim_express_frown">
290 LMA 290 Stirnrunzeln
291 </string> 291 </string>
292 <string name="anim_express_kiss"> 292 <string name="anim_impatient">
293 Küssen 293 Ungeduldig
294 </string> 294 </string>
295 <string name="anim_laugh_short"> 295 <string name="anim_jumpforjoy">
296 Lachen 296 Freudensprung
297 </string> 297 </string>
298 <string name="anim_musclebeach"> 298 <string name="anim_kissmybutt">
299 Posen 299 LMA
300 </string> 300 </string>
301 <string name="anim_no_unhappy"> 301 <string name="anim_express_kiss">
302 Nein (Bedauernd) 302 Küssen
303 </string> 303 </string>
304 <string name="anim_no_head"> 304 <string name="anim_laugh_short">
305 Nein 305 Lachen
306 </string> 306 </string>
307 <string name="anim_nyanya"> 307 <string name="anim_musclebeach">
308 Ällabätsch 308 Posen
309 </string> 309 </string>
310 <string name="anim_punch_onetwo"> 310 <string name="anim_no_unhappy">
311 Eins-Zwei-Punch 311 Nein (Bedauernd)
312 </string> 312 </string>
313 <string name="anim_express_open_mouth"> 313 <string name="anim_no_head">
314 Mund offen 314 Nein
315 </string> 315 </string>
316 <string name="anim_peace"> 316 <string name="anim_nyanya">
317 Friede 317 Ällabätsch
318 </string> 318 </string>
319 <string name="anim_point_you"> 319 <string name="anim_punch_onetwo">
320 Auf anderen zeigen 320 Eins-Zwei-Punch
321 </string> 321 </string>
322 <string name="anim_point_me"> 322 <string name="anim_express_open_mouth">
323 Auf mich zeigen 323 Mund offen
324 </string> 324 </string>
325 <string name="anim_punch_l"> 325 <string name="anim_peace">
326 Linker Haken 326 Friede
327 </string> 327 </string>
328 <string name="anim_punch_r"> 328 <string name="anim_point_you">
329 Rechter Haken 329 Auf anderen zeigen
330 </string> 330 </string>
331 <string name="anim_rps_countdown"> 331 <string name="anim_point_me">
332 SSP zählen 332 Auf mich zeigen
333 </string> 333 </string>
334 <string name="anim_rps_paper"> 334 <string name="anim_punch_l">
335 SSP Papier 335 Linker Haken
336 </string> 336 </string>
337 <string name="anim_rps_rock"> 337 <string name="anim_punch_r">
338 SSP Stein 338 Rechter Haken
339 </string> 339 </string>
340 <string name="anim_rps_scissors"> 340 <string name="anim_rps_countdown">
341 SSP Schere 341 SSP zählen
342 </string> 342 </string>
343 <string name="anim_express_repulsed"> 343 <string name="anim_rps_paper">
344 Angewidert 344 SSP Papier
345 </string> 345 </string>
346 <string name="anim_kick_roundhouse_r"> 346 <string name="anim_rps_rock">
347 Rundkick 347 SSP Stein
348 </string> 348 </string>
349 <string name="anim_express_sad"> 349 <string name="anim_rps_scissors">
350 Traurig 350 SSP Schere
351 </string> 351 </string>
352 <string name="anim_salute"> 352 <string name="anim_express_repulsed">
353 Salutieren 353 Angewidert
354 </string> 354 </string>
355 <string name="anim_shout"> 355 <string name="anim_kick_roundhouse_r">
356 Rufen 356 Rundkick
357 </string> 357 </string>
358 <string name="anim_express_shrug"> 358 <string name="anim_express_sad">
359 Schulterzucken 359 Traurig
360 </string> 360 </string>
361 <string name="anim_express_smile"> 361 <string name="anim_salute">
362 Lächeln 362 Salutieren
363 </string> 363 </string>
364 <string name="anim_smoke_idle"> 364 <string name="anim_shout">
365 Zigarette halten 365 Rufen
366 </string> 366 </string>
367 <string name="anim_smoke_inhale"> 367 <string name="anim_express_shrug">
368 Rauchen 368 Schulterzucken
369 </string> 369 </string>
370 <string name="anim_smoke_throw_down"> 370 <string name="anim_express_smile">
371 Zigarette wegwerfen 371 Lächeln
372 </string> 372 </string>
373 <string name="anim_express_surprise"> 373 <string name="anim_smoke_idle">
374 Überraschung 374 Zigarette halten
375 </string> 375 </string>
376 <string name="anim_sword_strike_r"> 376 <string name="anim_smoke_inhale">
377 Schwerthieb 377 Rauchen
378 </string> 378 </string>
379 <string name="anim_angry_tantrum"> 379 <string name="anim_smoke_throw_down">
380 Wutanfall 380 Zigarette wegwerfen
381 </string> 381 </string>
382 <string name="anim_express_tongue_out"> 382 <string name="anim_express_surprise">
383 Zunge rausstrecken 383 Überraschung
384 </string> 384 </string>
385 <string name="anim_hello"> 385 <string name="anim_sword_strike_r">
386 Winken 386 Schwerthieb
387 </string> 387 </string>
388 <string name="anim_whisper"> 388 <string name="anim_angry_tantrum">
389 Flüstern 389 Wutanfall
390 </string> 390 </string>
391 <string name="anim_whistle"> 391 <string name="anim_express_tongue_out">
392 Pfeifen 392 Zunge rausstrecken
393 </string> 393 </string>
394 <string name="anim_express_wink"> 394 <string name="anim_hello">
395 Zwinkern 395 Winken
396 </string> 396 </string>
397 <string name="anim_wink_hollywood"> 397 <string name="anim_whisper">
398 Zwinkern (Hollywood) 398 Flüstern
399 </string> 399 </string>
400 <string name="anim_express_worry"> 400 <string name="anim_whistle">
401 Sorgenvoll 401 Pfeifen
402 </string> 402 </string>
403 <string name="anim_yes_happy"> 403 <string name="anim_express_wink">
404 Ja (Erfreut) 404 Zwinkern
405 </string> 405 </string>
406 <string name="anim_yes_head"> 406 <string name="anim_wink_hollywood">
407 Ja 407 Zwinkern (Hollywood)
408 </string> 408 </string>
409 <string name="texture_loading"> 409 <string name="anim_express_worry">
410 Wird geladen... 410 Sorgenvoll
411 </string> 411 </string>
412 <string name="worldmap_offline"> 412 <string name="anim_yes_happy">
413 Offline 413 Ja (Erfreut)
414 </string> 414 </string>
415 <string name="whisper"> 415 <string name="anim_yes_head">
416 flüstert: 416 Ja
417 </string> 417 </string>
418 <string name="shout"> 418 <string name="texture_loading">
419 ruft: 419 Wird geladen...
420 </string> 420 </string>
421 <string name="SIM_ACCESS_PG"> 421 <string name="worldmap_offline">
422 PG 422 Offline
423 </string> 423 </string>
424 <string name="SIM_ACCESS_MATURE"> 424 <string name="whisper">
425 Mature 425 flüstert:
426 </string> 426 </string>
427 <string name="SIM_ACCESS_ADULT"> 427 <string name="shout">
428 Adult 428 ruft:
429 </string> 429 </string>
430 <string name="SIM_ACCESS_DOWN"> 430 <string name="SIM_ACCESS_PG">
431 Offline 431 PG
432 </string> 432 </string>
433 <string name="SIM_ACCESS_MIN"> 433 <string name="SIM_ACCESS_MATURE">
434 Unbekannt 434 Mature
435 </string> 435 </string>
436 <string name="land_type_unknown"> 436 <string name="SIM_ACCESS_ADULT">
437 (unbekannt) 437 Adult
438 </string> 438 </string>
439 <string name="covenant_never_modified"> 439 <string name="SIM_ACCESS_DOWN">
440 Zuletzt geändert: (nie) 440 Offline
441 </string> 441 </string>
442 <string name="covenant_modified"> 442 <string name="SIM_ACCESS_MIN">
443 Zuletzt geändert: 443 Unbekannt
444 </string> 444 </string>
445 <string name="all_files"> 445 <string name="land_type_unknown">
446 Alle Dateien 446 (unbekannt)
447 </string> 447 </string>
448 <string name="sound_files"> 448 <string name="covenant_never_modified">
449 Sounds 449 Zuletzt geändert: (nie)
450 </string> 450 </string>
451 <string name="animation_files"> 451 <string name="covenant_modified">
452 Animationen 452 Zuletzt geändert:
453 </string> 453 </string>
454 <string name="image_files"> 454 <string name="all_files">
455 Bilder 455 Alle Dateien
456 </string> 456 </string>
457 <string name="save_file_verb"> 457 <string name="sound_files">
458 Speichern 458 Sounds
459 </string> 459 </string>
460 <string name="load_file_verb"> 460 <string name="animation_files">
461 Laden 461 Animationen
462 </string> 462 </string>
463 <string name="targa_image_files"> 463 <string name="image_files">
464 Targa-Bilder 464 Bilder
465 </string> 465 </string>
466 <string name="bitmap_image_files"> 466 <string name="save_file_verb">
467 Bitmap-Bilder 467 Speichern
468 </string> 468 </string>
469 <string name="avi_movie_file"> 469 <string name="load_file_verb">
470 AVI-Filmdatei 470 Laden
471 </string> 471 </string>
472 <string name="xaf_animation_file"> 472 <string name="targa_image_files">
473 XAF Anim-Datei 473 Targa-Bilder
474 </string> 474 </string>
475 <string name="xml_file"> 475 <string name="bitmap_image_files">
476 XML-Datei 476 Bitmap-Bilder
477 </string> 477 </string>
478 <string name="dot_raw_file"> 478 <string name="avi_movie_file">
479 RAW-Datei 479 AVI-Filmdatei
480 </string> 480 </string>
481 <string name="compressed_image_files"> 481 <string name="xaf_animation_file">
482 Komprimierte Bilder 482 XAF Anim-Datei
483 </string> 483 </string>
484 <string name="load_files"> 484 <string name="xml_file">
485 Dateien laden 485 XML-Datei
486 </string> 486 </string>
487 <string name="choose_the_directory"> 487 <string name="dot_raw_file">
488 Verzeichnis auswählen 488 RAW-Datei
489 </string> 489 </string>
490</strings> 490 <string name="compressed_image_files">
491 Komprimierte Bilder
492 </string>
493 <string name="load_files">
494 Dateien laden
495 </string>
496 <string name="choose_the_directory">
497 Verzeichnis auswählen
498 </string>
499</strings>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 5bfe769..9814029 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -63,6 +63,25 @@
63 mouse_opaque="true" name="language_is_public" 63 mouse_opaque="true" name="language_is_public"
64 radio_style="false" tool_tip="This lets in-world objects know your preferred language." 64 radio_style="false" tool_tip="This lets in-world objects know your preferred language."
65 width="256" /> 65 width="256" />
66 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
67 bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
68 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="12"
69 mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
70 Crash reports:
71 </text>
72 <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
73 height="18" left="153" max_chars="20" mouse_opaque="true"
74 name="crash_behavior_combobox" width="146">
75 <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
76 Ask before sending
77 </combo_item>
78 <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
79 Always send
80 </combo_item>
81 <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
82 Never send
83 </combo_item>
84 </combo_box>
66 85
67 <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 86 <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250"
68 label="Reset All Preferences To Default" name="reset_btn" left="12" 87 label="Reset All Preferences To Default" name="reset_btn" left="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 6b8f7aa..49ab842 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -161,8 +161,8 @@
161 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 161 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
162 bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top" 162 bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
163 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" 163 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
164 mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394"> 164 mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
165 Crash reports: 165 Clock:
166 </text> 166 </text>
167 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 167 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
168 bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top" 168 bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -182,15 +182,15 @@
182 </string> 182 </string>
183 <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top" 183 <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
184 height="18" left="153" max_chars="20" mouse_opaque="true" 184 height="18" left="153" max_chars="20" mouse_opaque="true"
185 name="crash_behavior_combobox" width="146"> 185 name="time_combobox" width="146">
186 <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending"> 186 <combo_item type="string" length="1" enabled="true" name="12HourTime" value="Use 12 Hour Sim Time">
187 Ask before sending 187 Use 12 Hour Sim Time
188 </combo_item> 188 </combo_item>
189 <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send"> 189 <combo_item type="string" length="1" enabled="true" name="24HourTime" value="Use 24 Hour Sim Time">
190 Always send 190 Use 24 Hour Sim Time
191 </combo_item> 191 </combo_item>
192 <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send"> 192 <combo_item type="string" length="1" enabled="true" name="UTCTime" value="Use UTC Time">
193 Never send 193 Use UTC Time
194 </combo_item> 194 </combo_item>
195 </combo_box> 195 </combo_box>
196 <combo_box allow_text_entry="true" bottom="-382" enabled="true" 196 <combo_box allow_text_entry="true" bottom="-382" enabled="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 5a40a3d..1ef815e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -33,12 +33,6 @@
33 text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80"> 33 text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
34 12:00 AM 34 12:00 AM
35 </text> 35 </text>
36 <string name="StatBarDaysOfWeek">
37 Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
38 </string>
39 <string name="StatBarMonthsOfYear">
40 January:February:March:April:May:June:July:August:September:October:November:December
41 </string>
42 <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif" 36 <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
43 halign="center" height="16" image_selected="status_script_debug.tga" 37 halign="center" height="16" image_selected="status_script_debug.tga"
44 image_unselected="status_script_debug.tga" label="" label_selected="" 38 image_unselected="status_script_debug.tga" label="" label_selected=""
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 6a58ff4..5bd0924 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -11,6 +11,12 @@
11 <string name="server_version_changed_chat">The region you have entered is running a different simulator version: [SERVER_VERSION_INFO]</string> 11 <string name="server_version_changed_chat">The region you have entered is running a different simulator version: [SERVER_VERSION_INFO]</string>
12 <string name="hippo_label_free">free</string> 12 <string name="hippo_label_free">free</string>
13 <string name="hippo_label_week">week</string> 13 <string name="hippo_label_week">week</string>
14 <string name="StatBarDaysOfWeek">
15 Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
16 </string>
17 <string name="StatBarMonthsOfYear">
18 January:February:March:April:May:June:July:August:September:October:November:December
19 </string>
14 20
15 <!-- Login --> 21 <!-- Login -->
16 <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> 22 <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string>
diff --git a/linden/indra/newview/skins/default/xui/es/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/es/panel_status_bar.xml
index d48f2d9..e871d83 100644
--- a/linden/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -1,38 +1,32 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<panel name="status"> 2<panel name="status">
3 <text length="1" name="ParcelNameText" tool_tip="Nombre de la parcela en la que está. Pulse Acerca del terreno." type="string"> 3 <text length="1" name="ParcelNameText" tool_tip="Nombre de la parcela en la que está. Pulse Acerca del terreno." type="string">
4 el nombre de la parcela va aquí 4 el nombre de la parcela va aquí
5 </text> 5 </text>
6 <text length="1" name="BalanceText" tool_tip="Saldo de su cuenta" type="string"> 6 <text length="1" name="BalanceText" tool_tip="Saldo de su cuenta" type="string">
7 Cargando... 7 Cargando...
8 </text> 8 </text>
9 <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinero"/> 9 <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinero"/>
10 <text length="12" name="TimeText" tool_tip="Hora actual (costa oeste EE.UU.)" type="string"> 10 <text length="12" name="TimeText" tool_tip="Hora actual (costa oeste EE.UU.)" type="string">
11 12:00 AM 11 12:00 AM
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek"> 13 <button label="" label_selected="" name="scriptout" tool_tip="Errores y alertas de los scripts"/>
14 Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado 14 <button label="" label_selected="" name="health" tool_tip="Vida"/>
15 </string> 15 <text length="1" name="HealthText" tool_tip="Vida" type="string">
16 <string name="StatBarMonthsOfYear"> 16 100%
17 Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre 17 </text>
18 </string> 18 <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/>
19 <button label="" label_selected="" name="scriptout" tool_tip="Errores y alertas de los scripts"/> 19 <button label="" label_selected="" name="no_build" tool_tip="No se permite Construir/Renderizar"/>
20 <button label="" label_selected="" name="health" tool_tip="Vida"/> 20 <button label="" label_selected="" name="no_scripts" tool_tip="No se permiten los scripts"/>
21 <text length="1" name="HealthText" tool_tip="Vida" type="string"> 21 <button label="" label_selected="" name="restrictpush" tool_tip="Sin &apos;empujones&apos;"/>
22 100% 22 <button label="" label_selected="" name="status_no_voice" tool_tip="Aquí no está disponible la voz"/>
23 </text> 23 <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela"/>
24 <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/> 24 <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
25 <button label="" label_selected="" name="no_build" tool_tip="No se permite Construir/Renderizar"/> 25 <button label="" label_selected="" name="search_btn" tool_tip="Buscar en Second Life"/>
26 <button label="" label_selected="" name="no_scripts" tool_tip="No se permiten los scripts"/> 26 <string name="packet_loss_tooltip">
27 <button label="" label_selected="" name="restrictpush" tool_tip="Sin &apos;empujones&apos;"/> 27 Pérdida de paquetes
28 <button label="" label_selected="" name="status_no_voice" tool_tip="Aquí no está disponible la voz"/> 28 </string>
29 <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela"/> 29 <string name="bandwidth_tooltip">
30 <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/> 30 Ancho de banda
31 <button label="" label_selected="" name="search_btn" tool_tip="Buscar en Second Life"/> 31 </string>
32 <string name="packet_loss_tooltip"> 32</panel>
33 Pérdida de paquetes
34 </string>
35 <string name="bandwidth_tooltip">
36 Ancho de banda
37 </string>
38</panel>
diff --git a/linden/indra/newview/skins/default/xui/es/strings.xml b/linden/indra/newview/skins/default/xui/es/strings.xml
index 4793f6c..8cd1891 100644
--- a/linden/indra/newview/skins/default/xui/es/strings.xml
+++ b/linden/indra/newview/skins/default/xui/es/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Iniciando la sesión. [APP_NAME] debe de aparecer congelado. Por favor, espere. 17 Iniciando la sesión. [APP_NAME] debe de aparecer congelado. Por favor, espere.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 2e4c694..75969a1 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string"> 10 <text length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string">
11 midi 11 midi
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek">
14 Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
15 </string>
16 <string name="StatBarMonthsOfYear">
17 January:February:March:April:May:June:July:August:September:October:November:December
18 </string>
19 <button label="" label_selected="" name="scriptout" tool_tip="Alertes et erreurs de scripts"/> 13 <button label="" label_selected="" name="scriptout" tool_tip="Alertes et erreurs de scripts"/>
20 <button label="" label_selected="" name="health" tool_tip="Santé"/> 14 <button label="" label_selected="" name="health" tool_tip="Santé"/>
21 <text length="1" name="HealthText" tool_tip="Santé" type="string"> 15 <text length="1" name="HealthText" tool_tip="Santé" type="string">
diff --git a/linden/indra/newview/skins/default/xui/fr/strings.xml b/linden/indra/newview/skins/default/xui/fr/strings.xml
index 2961892..61615b1 100644
--- a/linden/indra/newview/skins/default/xui/fr/strings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/strings.xml
@@ -1,490 +1,499 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<!-- This file contains strings that used to be hardcoded in the source. 2<!-- This file contains strings that used to be hardcoded in the source.
3 It is only for those strings which do not belong in a floater. 3 It is only for those strings which do not belong in a floater.
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7 <string name="LoginInProgress"> 7
8 La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter. 8 <!-- Imprudence-specific strings -->
9 </string> 9 <string name="StatBarDaysOfWeek">
10 <string name="LoginAuthenticating"> 10 Dimanche:Lundi:Mardi:Mercredi:Jeudi:Vendredi:Samedi
11 Authentification en cours 11 </string>
12 </string> 12 <string name="StatBarMonthsOfYear">
13 <string name="LoginMaintenance"> 13 Janvier:Février:Mars:Avril:Mai:Juin:Juillet:Août:Septembre:Octobre:Novembre:Décembre
14 Maintenance du compte en cours… 14 </string>
15 </string> 15
16 <string name="LoginAttempt"> 16 <string name="LoginInProgress">
17 La tentative de connexion précédente a échoué. Connexion, esssai [NUMBER] 17 La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter.
18 </string> 18 </string>
19 <string name="LoginPrecaching"> 19 <string name="LoginAuthenticating">
20 Monde en cours de chargement… 20 Authentification en cours
21 </string> 21 </string>
22 <string name="LoginInitializingBrowser"> 22 <string name="LoginMaintenance">
23 Navigateur Web incorporé en cours d&apos;initialisation… 23 Maintenance du compte en cours…
24 </string> 24 </string>
25 <string name="LoginInitializingMultimedia"> 25 <string name="LoginAttempt">
26 Multimédia en cours d&apos;initialisation… 26 La tentative de connexion précédente a échoué. Connexion, esssai [NUMBER]
27 </string> 27 </string>
28 <string name="LoginVerifyingCache"> 28 <string name="LoginPrecaching">
29 Fichiers du cache en cours de vérification (peut prendre 60-90 s)... 29 Monde en cours de chargement…
30 </string> 30 </string>
31 <string name="LoginProcessingResponse"> 31 <string name="LoginInitializingBrowser">
32 Réponse en cours de traitement… 32 Navigateur Web incorporé en cours d&apos;initialisation…
33 </string> 33 </string>
34 <string name="LoginInitializingWorld"> 34 <string name="LoginInitializingMultimedia">
35 Monde en cours d&apos;initialisation… 35 Multimédia en cours d&apos;initialisation…
36 </string> 36 </string>
37 <string name="LoginDecodingImages"> 37 <string name="LoginVerifyingCache">
38 Décodage des images en cours... 38 Fichiers du cache en cours de vérification (peut prendre 60-90 s)...
39 </string> 39 </string>
40 <string name="LoginInitializingQuicktime"> 40 <string name="LoginProcessingResponse">
41 Quicktime en cours d&apos;initialisation 41 Réponse en cours de traitement…
42 </string> 42 </string>
43 <string name="LoginQuicktimeNotFound"> 43 <string name="LoginInitializingWorld">
44 Quicktime introuvable, impossible de procéder à l&apos;initialisation. 44 Monde en cours d&apos;initialisation…
45 </string> 45 </string>
46 <string name="LoginQuicktimeOK"> 46 <string name="LoginDecodingImages">
47 Initialisation de Quicktime réussie. 47 Décodage des images en cours...
48 </string> 48 </string>
49 <string name="LoginWaitingForRegionHandshake"> 49 <string name="LoginInitializingQuicktime">
50 Liaison avec la région en cours de création... 50 Quicktime en cours d&apos;initialisation
51 </string> 51 </string>
52 <string name="LoginConnectingToRegion"> 52 <string name="LoginQuicktimeNotFound">
53 Connexion avec la région en cours... 53 Quicktime introuvable, impossible de procéder à l&apos;initialisation.
54 </string> 54 </string>
55 <string name="LoginDownloadingClothing"> 55 <string name="LoginQuicktimeOK">
56 Habits en cours de téléchargement... 56 Initialisation de Quicktime réussie.
57 </string> 57 </string>
58 <string name="AgentLostConnection"> 58 <string name="LoginWaitingForRegionHandshake">
59 Il y a peut-être des problèmes techniques dans cette region. Veuillez vérifier votre connexion Internet. 59 Liaison avec la région en cours de création...
60 </string> 60 </string>
61 <string name="TooltipPerson"> 61 <string name="LoginConnectingToRegion">
62 Personne 62 Connexion avec la région en cours...
63 </string> 63 </string>
64 <string name="TooltipNoName"> 64 <string name="LoginDownloadingClothing">
65 (pas de nom) 65 Habits en cours de téléchargement...
66 </string> 66 </string>
67 <string name="TooltipOwner"> 67 <string name="AgentLostConnection">
68 Propriétaire : 68 Il y a peut-être des problèmes techniques dans cette region. Veuillez vérifier votre connexion Internet.
69 </string> 69 </string>
70 <string name="TooltipPublic"> 70 <string name="TooltipPerson">
71 Public 71 Personne
72 </string> 72 </string>
73 <string name="TooltipIsGroup"> 73 <string name="TooltipNoName">
74 (Groupe) 74 (pas de nom)
75 </string> 75 </string>
76 <string name="TooltipFlagScript"> 76 <string name="TooltipOwner">
77 Script 77 Propriétaire :
78 </string> 78 </string>
79 <string name="TooltipFlagPhysics"> 79 <string name="TooltipPublic">
80 Propriétés physique 80 Public
81 </string> 81 </string>
82 <string name="TooltipFlagTouch"> 82 <string name="TooltipIsGroup">
83 Toucher 83 (Groupe)
84 </string> 84 </string>
85 <string name="TooltipFlagL$"> 85 <string name="TooltipFlagScript">
86 L$ 86 Script
87 </string> 87 </string>
88 <string name="TooltipFlagDropInventory"> 88 <string name="TooltipFlagPhysics">
89 Laisser tomber l&apos;inventaire 89 Propriétés physique
90 </string> 90 </string>
91 <string name="TooltipFlagPhantom"> 91 <string name="TooltipFlagTouch">
92 Fantôme 92 Toucher
93 </string> 93 </string>
94 <string name="TooltipFlagTemporary"> 94 <string name="TooltipFlagL$">
95 Temporaire 95 L$
96 </string> 96 </string>
97 <string name="TooltipFlagRightClickMenu"> 97 <string name="TooltipFlagDropInventory">
98 (cliquez-droit pour le menu) 98 Laisser tomber l&apos;inventaire
99 </string> 99 </string>
100 <string name="TooltipFreeToCopy"> 100 <string name="TooltipFlagPhantom">
101 Copie autorisée 101 Fantôme
102 </string> 102 </string>
103 <string name="TooltipForSaleL$"> 103 <string name="TooltipFlagTemporary">
104 À vendre : [AMOUNT] L$ 104 Temporaire
105 </string> 105 </string>
106 <string name="TooltipForSaleMsg"> 106 <string name="TooltipFlagRightClickMenu">
107 À vendre : [MESSAGE] 107 (cliquez-droit pour le menu)
108 </string> 108 </string>
109 <string name="TooltipFlagGroupBuild"> 109 <string name="TooltipFreeToCopy">
110 Contruction de groupe 110 Copie autorisée
111 </string> 111 </string>
112 <string name="TooltipFlagNoBuild"> 112 <string name="TooltipForSaleL$">
113 Pas de construction 113 À vendre : [AMOUNT] L$
114 </string> 114 </string>
115 <string name="TooltipFlagNoEdit"> 115 <string name="TooltipForSaleMsg">
116 Contruction de groupe 116 À vendre : [MESSAGE]
117 </string> 117 </string>
118 <string name="TooltipFlagNotSafe"> 118 <string name="TooltipFlagGroupBuild">
119 Non sécurisé 119 Contruction de groupe
120 </string> 120 </string>
121 <string name="TooltipFlagNoFly"> 121 <string name="TooltipFlagNoBuild">
122 Interdiction de voler 122 Pas de construction
123 </string> 123 </string>
124 <string name="TooltipFlagGroupScripts"> 124 <string name="TooltipFlagNoEdit">
125 Scripts de groupe 125 Contruction de groupe
126 </string> 126 </string>
127 <string name="TooltipFlagNoScripts"> 127 <string name="TooltipFlagNotSafe">
128 Pas de scripts 128 Non sécurisé
129 </string> 129 </string>
130 <string name="TooltipLand"> 130 <string name="TooltipFlagNoFly">
131 Terrain : 131 Interdiction de voler
132 </string> 132 </string>
133 <string name="TooltipMustSingleDrop"> 133 <string name="TooltipFlagGroupScripts">
134 Impossible de faire glisser plus d&apos;un objet ici 134 Scripts de groupe
135 </string> 135 </string>
136 <string name="RetrievingData"> 136 <string name="TooltipFlagNoScripts">
137 En cours d&apos;extraction... 137 Pas de scripts
138 </string> 138 </string>
139 <string name="ReleaseNotes"> 139 <string name="TooltipLand">
140 Notes de version 140 Terrain :
141 </string> 141 </string>
142 <string name="LoadingData"> 142 <string name="TooltipMustSingleDrop">
143 Chargement.. 143 Impossible de faire glisser plus d&apos;un objet ici
144 </string> 144 </string>
145 <string name="AvatarNameNobody"> 145 <string name="RetrievingData">
146 (personne) 146 En cours d&apos;extraction...
147 </string> 147 </string>
148 <string name="AvatarNameWaiting"> 148 <string name="ReleaseNotes">
149 (en attente) 149 Notes de version
150 </string> 150 </string>
151 <string name="AvatarNameHippos"> 151 <string name="LoadingData">
152 (hippos) 152 Chargement..
153 </string> 153 </string>
154 <string name="GroupNameNone"> 154 <string name="AvatarNameNobody">
155 (aucun) 155 (personne)
156 </string> 156 </string>
157 <string name="AssetErrorNone"> 157 <string name="AvatarNameWaiting">
158 Aucune erreur 158 (en attente)
159 </string> 159 </string>
160 <string name="AssetErrorRequestFailed"> 160 <string name="AvatarNameHippos">
161 Requête de l&apos;actif : échec 161 (hippos)
162 </string> 162 </string>
163 <string name="AssetErrorNonexistentFile"> 163 <string name="GroupNameNone">
164 Requête de l&apos;actif : fichier inexistant 164 (aucun)
165 </string> 165 </string>
166 <string name="AssetErrorNotInDatabase"> 166 <string name="AssetErrorNone">
167 Requête de l&apos;actif : actif introuvable dans la base de données 167 Aucune erreur
168 </string> 168 </string>
169 <string name="AssetErrorEOF"> 169 <string name="AssetErrorRequestFailed">
170 Fin du ficher 170 Requête de l&apos;actif : échec
171 </string> 171 </string>
172 <string name="AssetErrorCannotOpenFile"> 172 <string name="AssetErrorNonexistentFile">
173 Impossible d&apos;ouvrir le fichier 173 Requête de l&apos;actif : fichier inexistant
174 </string> 174 </string>
175 <string name="AssetErrorFileNotFound"> 175 <string name="AssetErrorNotInDatabase">
176 Fichier introuvable 176 Requête de l&apos;actif : actif introuvable dans la base de données
177 </string> 177 </string>
178 <string name="AssetErrorTCPTimeout"> 178 <string name="AssetErrorEOF">
179 Délai d&apos;attente du transfert du fichier dépassé 179 Fin du ficher
180 </string> 180 </string>
181 <string name="AssetErrorCircuitGone"> 181 <string name="AssetErrorCannotOpenFile">
182 Disparition du circuit 182 Impossible d&apos;ouvrir le fichier
183 </string> 183 </string>
184 <string name="AssetErrorPriceMismatch"> 184 <string name="AssetErrorFileNotFound">
185 Il y a une différence de prix entre le client et le serveur 185 Fichier introuvable
186 </string> 186 </string>
187 <string name="AssetErrorUnknownStatus"> 187 <string name="AssetErrorTCPTimeout">
188 Statut inconnu 188 Délai d&apos;attente du transfert du fichier dépassé
189 </string> 189 </string>
190 <string name="AvatarEditingApparance"> 190 <string name="AssetErrorCircuitGone">
191 (Apparence en cours de modification) 191 Disparition du circuit
192 </string> 192 </string>
193 <string name="AvatarAway"> 193 <string name="AssetErrorPriceMismatch">
194 Absent 194 Il y a une différence de prix entre le client et le serveur
195 </string> 195 </string>
196 <string name="AvatarBusy"> 196 <string name="AssetErrorUnknownStatus">
197 Occupé 197 Statut inconnu
198 </string> 198 </string>
199 <string name="AvatarMuted"> 199 <string name="AvatarEditingApparance">
200 Ignoré 200 (Apparence en cours de modification)
201 </string> 201 </string>
202 <string name="anim_express_afraid"> 202 <string name="AvatarAway">
203 Effrayé 203 Absent
204 </string> 204 </string>
205 <string name="anim_express_anger"> 205 <string name="AvatarBusy">
206 En colère 206 Occupé
207 </string> 207 </string>
208 <string name="anim_away"> 208 <string name="AvatarMuted">
209 Absent 209 Ignoré
210 </string> 210 </string>
211 <string name="anim_backflip"> 211 <string name="anim_express_afraid">
212 Salto arrière 212 Effrayé
213 </string> 213 </string>
214 <string name="anim_express_laugh"> 214 <string name="anim_express_anger">
215 Rire en se tenant le ventre 215 En colère
216 </string> 216 </string>
217 <string name="anim_express_toothsmile"> 217 <string name="anim_away">
218 Grand sourire 218 Absent
219 </string> 219 </string>
220 <string name="anim_blowkiss"> 220 <string name="anim_backflip">
221 Envoyer un baiser 221 Salto arrière
222 </string> 222 </string>
223 <string name="anim_express_bored"> 223 <string name="anim_express_laugh">
224 Bailler d&apos;ennui 224 Rire en se tenant le ventre
225 </string> 225 </string>
226 <string name="anim_bow"> 226 <string name="anim_express_toothsmile">
227 S&apos;incliner 227 Grand sourire
228 </string> 228 </string>
229 <string name="anim_clap"> 229 <string name="anim_blowkiss">
230 Applaudir 230 Envoyer un baiser
231 </string> 231 </string>
232 <string name="anim_courtbow"> 232 <string name="anim_express_bored">
233 Révérence de cour 233 Bailler d&apos;ennui
234 </string> 234 </string>
235 <string name="anim_express_cry"> 235 <string name="anim_bow">
236 Pleurer 236 S&apos;incliner
237 </string> 237 </string>
238 <string name="anim_dance1"> 238 <string name="anim_clap">
239 Danse 1 239 Applaudir
240 </string> 240 </string>
241 <string name="anim_dance2"> 241 <string name="anim_courtbow">
242 Danse 2 242 Révérence de cour
243 </string> 243 </string>
244 <string name="anim_dance3"> 244 <string name="anim_express_cry">
245 Danse 3 245 Pleurer
246 </string> 246 </string>
247 <string name="anim_dance4"> 247 <string name="anim_dance1">
248 Danse 4 248 Danse 1
249 </string> 249 </string>
250 <string name="anim_dance5"> 250 <string name="anim_dance2">
251 Danse 5 251 Danse 2
252 </string> 252 </string>
253 <string name="anim_dance6"> 253 <string name="anim_dance3">
254 Danse 6 254 Danse 3
255 </string> 255 </string>
256 <string name="anim_dance7"> 256 <string name="anim_dance4">
257 Danse 7 257 Danse 4
258 </string> 258 </string>
259 <string name="anim_dance8"> 259 <string name="anim_dance5">
260 Danse 8 260 Danse 5
261 </string> 261 </string>
262 <string name="anim_express_disdain"> 262 <string name="anim_dance6">
263 Mépris 263 Danse 6
264 </string> 264 </string>
265 <string name="anim_drink"> 265 <string name="anim_dance7">
266 Boire 266 Danse 7
267 </string> 267 </string>
268 <string name="anim_express_embarrased"> 268 <string name="anim_dance8">
269 Gêne 269 Danse 8
270 </string> 270 </string>
271 <string name="anim_angry_fingerwag"> 271 <string name="anim_express_disdain">
272 Désapprobation 272 Mépris
273 </string> 273 </string>
274 <string name="anim_fist_pump"> 274 <string name="anim_drink">
275 Victoire 275 Boire
276 </string> 276 </string>
277 <string name="anim_yoga_float"> 277 <string name="anim_express_embarrased">
278 Yoga 278 Gêne
279 </string> 279 </string>
280 <string name="anim_express_frown"> 280 <string name="anim_angry_fingerwag">
281 Froncer les sourcils 281 Désapprobation
282 </string> 282 </string>
283 <string name="anim_impatient"> 283 <string name="anim_fist_pump">
284 Impatient 284 Victoire
285 </string> 285 </string>
286 <string name="anim_jumpforjoy"> 286 <string name="anim_yoga_float">
287 Sauter de joie 287 Yoga
288 </string> 288 </string>
289 <string name="anim_kissmybutt"> 289 <string name="anim_express_frown">
290 Va te faire voir ! 290 Froncer les sourcils
291 </string> 291 </string>
292 <string name="anim_express_kiss"> 292 <string name="anim_impatient">
293 Baiser 293 Impatient
294 </string> 294 </string>
295 <string name="anim_laugh_short"> 295 <string name="anim_jumpforjoy">
296 Rire 296 Sauter de joie
297 </string> 297 </string>
298 <string name="anim_musclebeach"> 298 <string name="anim_kissmybutt">
299 Montrer ses muscles 299 Va te faire voir !
300 </string> 300 </string>
301 <string name="anim_no_unhappy"> 301 <string name="anim_express_kiss">
302 Non (mécontent) 302 Baiser
303 </string> 303 </string>
304 <string name="anim_no_head"> 304 <string name="anim_laugh_short">
305 Non 305 Rire
306 </string> 306 </string>
307 <string name="anim_nyanya"> 307 <string name="anim_musclebeach">
308 Na na na na nère 308 Montrer ses muscles
309 </string> 309 </string>
310 <string name="anim_punch_onetwo"> 310 <string name="anim_no_unhappy">
311 Gauche-droite 311 Non (mécontent)
312 </string> 312 </string>
313 <string name="anim_express_open_mouth"> 313 <string name="anim_no_head">
314 Bouche ouverte 314 Non
315 </string> 315 </string>
316 <string name="anim_peace"> 316 <string name="anim_nyanya">
317 Paix 317 Na na na na nère
318 </string> 318 </string>
319 <string name="anim_point_you"> 319 <string name="anim_punch_onetwo">
320 Montrer quelqu&apos;un du doigt 320 Gauche-droite
321 </string> 321 </string>
322 <string name="anim_point_me"> 322 <string name="anim_express_open_mouth">
323 Se montrer du doigt 323 Bouche ouverte
324 </string> 324 </string>
325 <string name="anim_punch_l"> 325 <string name="anim_peace">
326 Gauche 326 Paix
327 </string> 327 </string>
328 <string name="anim_punch_r"> 328 <string name="anim_point_you">
329 Droite 329 Montrer quelqu&apos;un du doigt
330 </string> 330 </string>
331 <string name="anim_rps_countdown"> 331 <string name="anim_point_me">
332 Compter (pierre-papier-ciseaux) 332 Se montrer du doigt
333 </string> 333 </string>
334 <string name="anim_rps_paper"> 334 <string name="anim_punch_l">
335 Papier (pierre-papier-ciseaux) 335 Gauche
336 </string> 336 </string>
337 <string name="anim_rps_rock"> 337 <string name="anim_punch_r">
338 Pierre (pierre-papier-ciseaux) 338 Droite
339 </string> 339 </string>
340 <string name="anim_rps_scissors"> 340 <string name="anim_rps_countdown">
341 Ciseaux (pierre-papier-ciseaux) 341 Compter (pierre-papier-ciseaux)
342 </string> 342 </string>
343 <string name="anim_express_repulsed"> 343 <string name="anim_rps_paper">
344 Dégoût 344 Papier (pierre-papier-ciseaux)
345 </string> 345 </string>
346 <string name="anim_kick_roundhouse_r"> 346 <string name="anim_rps_rock">
347 Coup de pied circulaire 347 Pierre (pierre-papier-ciseaux)
348 </string> 348 </string>
349 <string name="anim_express_sad"> 349 <string name="anim_rps_scissors">
350 Triste 350 Ciseaux (pierre-papier-ciseaux)
351 </string> 351 </string>
352 <string name="anim_salute"> 352 <string name="anim_express_repulsed">
353 Salut 353 Dégoût
354 </string> 354 </string>
355 <string name="anim_shout"> 355 <string name="anim_kick_roundhouse_r">
356 Crier 356 Coup de pied circulaire
357 </string> 357 </string>
358 <string name="anim_express_shrug"> 358 <string name="anim_express_sad">
359 Hausser les épaules 359 Triste
360 </string> 360 </string>
361 <string name="anim_express_smile"> 361 <string name="anim_salute">
362 Sourire 362 Salut
363 </string> 363 </string>
364 <string name="anim_smoke_idle"> 364 <string name="anim_shout">
365 Fumer, immobile 365 Crier
366 </string> 366 </string>
367 <string name="anim_smoke_inhale"> 367 <string name="anim_express_shrug">
368 Fumer, prendre une bouffée 368 Hausser les épaules
369 </string> 369 </string>
370 <string name="anim_smoke_throw_down"> 370 <string name="anim_express_smile">
371 Fumer, jeter son mégot 371 Sourire
372 </string> 372 </string>
373 <string name="anim_express_surprise"> 373 <string name="anim_smoke_idle">
374 Surprise 374 Fumer, immobile
375 </string> 375 </string>
376 <string name="anim_sword_strike_r"> 376 <string name="anim_smoke_inhale">
377 Coup d&apos;épée 377 Fumer, prendre une bouffée
378 </string> 378 </string>
379 <string name="anim_angry_tantrum"> 379 <string name="anim_smoke_throw_down">
380 Caprice 380 Fumer, jeter son mégot
381 </string> 381 </string>
382 <string name="anim_express_tongue_out"> 382 <string name="anim_express_surprise">
383 Tirer la langue 383 Surprise
384 </string> 384 </string>
385 <string name="anim_hello"> 385 <string name="anim_sword_strike_r">
386 Faire signe 386 Coup d&apos;épée
387 </string> 387 </string>
388 <string name="anim_whisper"> 388 <string name="anim_angry_tantrum">
389 Chuchoter 389 Caprice
390 </string> 390 </string>
391 <string name="anim_whistle"> 391 <string name="anim_express_tongue_out">
392 Siffler 392 Tirer la langue
393 </string> 393 </string>
394 <string name="anim_express_wink"> 394 <string name="anim_hello">
395 Clin d&apos;œil 395 Faire signe
396 </string> 396 </string>
397 <string name="anim_wink_hollywood"> 397 <string name="anim_whisper">
398 Clin d&apos;œil (Hollywood) 398 Chuchoter
399 </string> 399 </string>
400 <string name="anim_express_worry"> 400 <string name="anim_whistle">
401 Soucis 401 Siffler
402 </string> 402 </string>
403 <string name="anim_yes_happy"> 403 <string name="anim_express_wink">
404 Oui (Joie) 404 Clin d&apos;œil
405 </string> 405 </string>
406 <string name="anim_yes_head"> 406 <string name="anim_wink_hollywood">
407 Oui 407 Clin d&apos;œil (Hollywood)
408 </string> 408 </string>
409 <string name="texture_loading"> 409 <string name="anim_express_worry">
410 Chargement... 410 Soucis
411 </string> 411 </string>
412 <string name="worldmap_offline"> 412 <string name="anim_yes_happy">
413 Hors ligne 413 Oui (Joie)
414 </string> 414 </string>
415 <string name="whisper"> 415 <string name="anim_yes_head">
416 chuchote : 416 Oui
417 </string> 417 </string>
418 <string name="shout"> 418 <string name="texture_loading">
419 crie : 419 Chargement...
420 </string> 420 </string>
421 <string name="SIM_ACCESS_PG"> 421 <string name="worldmap_offline">
422 PG 422 Hors ligne
423 </string> 423 </string>
424 <string name="SIM_ACCESS_MATURE"> 424 <string name="whisper">
425 Mature 425 chuchote :
426 </string> 426 </string>
427 <string name="SIM_ACCESS_ADULT"> 427 <string name="shout">
428 Adult 428 crie :
429 </string> 429 </string>
430 <string name="SIM_ACCESS_DOWN"> 430 <string name="SIM_ACCESS_PG">
431 Hors ligne 431 PG
432 </string> 432 </string>
433 <string name="SIM_ACCESS_MIN"> 433 <string name="SIM_ACCESS_MATURE">
434 Inconnu 434 Mature
435 </string> 435 </string>
436 <string name="land_type_unknown"> 436 <string name="SIM_ACCESS_ADULT">
437 (inconnu) 437 Adult
438 </string> 438 </string>
439 <string name="covenant_never_modified"> 439 <string name="SIM_ACCESS_DOWN">
440 Dernière modification : (jamais) 440 Hors ligne
441 </string> 441 </string>
442 <string name="covenant_modified"> 442 <string name="SIM_ACCESS_MIN">
443 Dernière modification : 443 Inconnu
444 </string> 444 </string>
445 <string name="all_files"> 445 <string name="land_type_unknown">
446 Tous fichiers 446 (inconnu)
447 </string> 447 </string>
448 <string name="sound_files"> 448 <string name="covenant_never_modified">
449 Sons 449 Dernière modification : (jamais)
450 </string> 450 </string>
451 <string name="animation_files"> 451 <string name="covenant_modified">
452 Animations 452 Dernière modification :
453 </string> 453 </string>
454 <string name="image_files"> 454 <string name="all_files">
455 Images 455 Tous fichiers
456 </string> 456 </string>
457 <string name="save_file_verb"> 457 <string name="sound_files">
458 Enregistrer 458 Sons
459 </string> 459 </string>
460 <string name="load_file_verb"> 460 <string name="animation_files">
461 Charger 461 Animations
462 </string> 462 </string>
463 <string name="targa_image_files"> 463 <string name="image_files">
464 Images Targa 464 Images
465 </string> 465 </string>
466 <string name="bitmap_image_files"> 466 <string name="save_file_verb">
467 Images Bitmap 467 Enregistrer
468 </string> 468 </string>
469 <string name="avi_movie_file"> 469 <string name="load_file_verb">
470 Fichier de film AVI 470 Charger
471 </string> 471 </string>
472 <string name="xaf_animation_file"> 472 <string name="targa_image_files">
473 Fichier d&apos;animation XAF 473 Images Targa
474 </string> 474 </string>
475 <string name="xml_file"> 475 <string name="bitmap_image_files">
476 Fichier XML 476 Images Bitmap
477 </string> 477 </string>
478 <string name="dot_raw_file"> 478 <string name="avi_movie_file">
479 Fichier RAW 479 Fichier de film AVI
480 </string> 480 </string>
481 <string name="compressed_image_files"> 481 <string name="xaf_animation_file">
482 Images compressées 482 Fichier d&apos;animation XAF
483 </string> 483 </string>
484 <string name="load_files"> 484 <string name="xml_file">
485 Charger des fichiers 485 Fichier XML
486 </string> 486 </string>
487 <string name="choose_the_directory"> 487 <string name="dot_raw_file">
488 Choisir le répertoire 488 Fichier RAW
489 </string> 489 </string>
490</strings> 490 <string name="compressed_image_files">
491 Images compressées
492 </string>
493 <string name="load_files">
494 Charger des fichiers
495 </string>
496 <string name="choose_the_directory">
497 Choisir le répertoire
498 </string>
499</strings>
diff --git a/linden/indra/newview/skins/default/xui/hu/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/hu/panel_status_bar.xml
index 06dafb6..06f8bca 100644
--- a/linden/indra/newview/skins/default/xui/hu/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/hu/panel_status_bar.xml
@@ -11,12 +11,6 @@
11 <text type="string" length="12" name="TimeText" tool_tip="Jelenlegi idő (PST)"> 11 <text type="string" length="12" name="TimeText" tool_tip="Jelenlegi idő (PST)">
12 12:00 de 12 12:00 de
13 </text> 13 </text>
14 <string name="StatBarDaysOfWeek">
15 Vasárnap:Hétfő:Kedd:Szerda:Csütörtök:Péntek:Szombat
16 </string>
17 <string name="StatBarMonthsOfYear">
18 Január:Február:Március:Április:Május:Június:Július:Augusztus:Szeptember:Október:November:December
19 </string>
20 <button label="" label_selected="" name="scriptout" 14 <button label="" label_selected="" name="scriptout"
21 tool_tip="Kódhibák és figyelmeztetések" /> 15 tool_tip="Kódhibák és figyelmeztetések" />
22 <button label="" label_selected="" name="health" tool_tip="Állapot" /> 16 <button label="" label_selected="" name="health" tool_tip="Állapot" />
diff --git a/linden/indra/newview/skins/default/xui/hu/strings.xml b/linden/indra/newview/skins/default/xui/hu/strings.xml
index a95ccfb..730fa28 100644
--- a/linden/indra/newview/skins/default/xui/hu/strings.xml
+++ b/linden/indra/newview/skins/default/xui/hu/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Vasárnap:Hétfő:Kedd:Szerda:Csütörtök:Péntek:Szombat
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Január:Február:Március:Április:Május:Június:Július:Augusztus:Szeptember:Október:November:December
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Bejelentkezés folyamatban. [APP_NAME] hibát jelzett. Kérjük várj!. 17 Bejelentkezés folyamatban. [APP_NAME] hibát jelzett. Kérjük várj!.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/it/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 2403dce..bf84aaf 100644
--- a/linden/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text name="TimeText" tool_tip="Ora corrente (Pacifico)"> 10 <text name="TimeText" tool_tip="Ora corrente (Pacifico)">
11 12:00 AM 11 12:00 AM
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek">
14 Domenica:Lunedì:Martedì:Mercoledì:Giovedì:Venerdì:Sabato
15 </string>
16 <string name="StatBarMonthsOfYear">
17 Gennaio:Febbraio:Marzo:Aprile:Maggio:Giugno:Luglio:Agosto:Settembre:Ottobre:Novembre:Dicembre
18 </string>
19 <button label="" label_selected="" name="scriptout" tool_tip="Avvisi ed Errori degli script"/> 13 <button label="" label_selected="" name="scriptout" tool_tip="Avvisi ed Errori degli script"/>
20 <button label="" label_selected="" name="health" tool_tip="Salute"/> 14 <button label="" label_selected="" name="health" tool_tip="Salute"/>
21 <text name="HealthText" tool_tip="Salute"> 15 <text name="HealthText" tool_tip="Salute">
diff --git a/linden/indra/newview/skins/default/xui/it/strings.xml b/linden/indra/newview/skins/default/xui/it/strings.xml
index 1cf12cb..7089a93 100644
--- a/linden/indra/newview/skins/default/xui/it/strings.xml
+++ b/linden/indra/newview/skins/default/xui/it/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Domenica:Lunedì:Martedì:Mercoledì:Giovedì:Venerdì:Sabato
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Gennaio:Febbraio:Marzo:Aprile:Maggio:Giugno:Luglio:Agosto:Settembre:Ottobre:Novembre:Dicembre
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 In connessione. [APP_NAME] può sembrare rallentata. Attendi. 17 In connessione. [APP_NAME] può sembrare rallentata. Attendi.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 08c6618..c87371f 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text length="12" name="TimeText" tool_tip="現在時刻（太平洋時）" type="string"> 10 <text length="12" name="TimeText" tool_tip="現在時刻（太平洋時）" type="string">
11 12：00 AM 11 12：00 AM
12 </text> 12 </text>
13 <text name="StatBarDaysOfWeek">
14 日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日
15 </text>
16 <text name="StatBarMonthsOfYear">
17 1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月
18 </text>
19 <button label="" label_selected="" name="scriptout" tool_tip="スクリプト警告およびエラー"/> 13 <button label="" label_selected="" name="scriptout" tool_tip="スクリプト警告およびエラー"/>
20 <button label="" label_selected="" name="health" tool_tip="健康状態"/> 14 <button label="" label_selected="" name="health" tool_tip="健康状態"/>
21 <text length="1" name="HealthText" tool_tip="健康状態" type="string"> 15 <text length="1" name="HealthText" tool_tip="健康状態" type="string">
diff --git a/linden/indra/newview/skins/default/xui/ja/strings.xml b/linden/indra/newview/skins/default/xui/ja/strings.xml
index c5639f6..b71ab22 100644
--- a/linden/indra/newview/skins/default/xui/ja/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/strings.xml
@@ -1,490 +1,499 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<!-- This file contains strings that used to be hardcoded in the source. 2<!-- This file contains strings that used to be hardcoded in the source.
3 It is only for those strings which do not belong in a floater. 3 It is only for those strings which do not belong in a floater.
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7 <string name="LoginInProgress"> 7
8 ログイン中です。[APP_NAME]の表示がフリーズする場合があります。 しばらくお待ちください。 8 <!-- Imprudence-specific strings -->
9 </string> 9 <text name="StatBarDaysOfWeek">
10 <string name="LoginAuthenticating"> 10 日曜日:月曜日:火曜日:水曜日:木曜日:金曜日:土曜日
11 認証しています... 11 </text>
12 </string> 12 <text name="StatBarMonthsOfYear">
13 <string name="LoginMaintenance"> 13 1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月
14 アカウント・メンテナンスを実行しています... 14 </text>
15 </string> 15
16 <string name="LoginAttempt"> 16 <string name="LoginInProgress">
17 前回のログインに失敗しました。 ログイン中です([NUMBER]回目) 17 ログイン中です。[APP_NAME]の表示がフリーズする場合があります。 しばらくお待ちください。
18 </string> 18 </string>
19 <string name="LoginPrecaching"> 19 <string name="LoginAuthenticating">
20 ワールドをロードしています... 20 認証しています...
21 </string> 21 </string>
22 <string name="LoginInitializingBrowser"> 22 <string name="LoginMaintenance">
23 埋め込みWebブラウザを初期化しています... 23 アカウント・メンテナンスを実行しています...
24 </string> 24 </string>
25 <string name="LoginInitializingMultimedia"> 25 <string name="LoginAttempt">
26 マルチメディアを初期化しています... 26 前回のログインに失敗しました。 ログイン中です([NUMBER]回目)
27 </string> 27 </string>
28 <string name="LoginVerifyingCache"> 28 <string name="LoginPrecaching">
29 キャッシュ・ファイルを検証しています(所要時間は60～90秒)... 29 ワールドをロードしています...
30 </string> 30 </string>
31 <string name="LoginProcessingResponse"> 31 <string name="LoginInitializingBrowser">
32 応答を処理しています... 32 埋め込みWebブラウザを初期化しています...
33 </string> 33 </string>
34 <string name="LoginInitializingWorld"> 34 <string name="LoginInitializingMultimedia">
35 ワールドを初期化しています... 35 マルチメディアを初期化しています...
36 </string> 36 </string>
37 <string name="LoginDecodingImages"> 37 <string name="LoginVerifyingCache">
38 画像をデコードしています... 38 キャッシュ・ファイルを検証しています(所要時間は60～90秒)...
39 </string> 39 </string>
40 <string name="LoginInitializingQuicktime"> 40 <string name="LoginProcessingResponse">
41 QuickTimeを初期化しています... 41 応答を処理しています...
42 </string> 42 </string>
43 <string name="LoginQuicktimeNotFound"> 43 <string name="LoginInitializingWorld">
44 QuickTimeが見つかりません。初期化に失敗しました。 44 ワールドを初期化しています...
45 </string> 45 </string>
46 <string name="LoginQuicktimeOK"> 46 <string name="LoginDecodingImages">
47 QuickTimeが正常に初期化されました。 47 画像をデコードしています...
48 </string> 48 </string>
49 <string name="LoginWaitingForRegionHandshake"> 49 <string name="LoginInitializingQuicktime">
50 地域のハンドシェイクを待っています... 50 QuickTimeを初期化しています...
51 </string> 51 </string>
52 <string name="LoginConnectingToRegion"> 52 <string name="LoginQuicktimeNotFound">
53 地域に接続しています... 53 QuickTimeが見つかりません。初期化に失敗しました。
54 </string> 54 </string>
55 <string name="LoginDownloadingClothing"> 55 <string name="LoginQuicktimeOK">
56 服をダウンロードしています... 56 QuickTimeが正常に初期化されました。
57 </string> 57 </string>
58 <string name="AgentLostConnection"> 58 <string name="LoginWaitingForRegionHandshake">
59 この地域には、問題が発生している可能性があります。 インターネット接続を確認してください。 59 地域のハンドシェイクを待っています...
60 </string> 60 </string>
61 <string name="TooltipPerson"> 61 <string name="LoginConnectingToRegion">
62 人 62 地域に接続しています...
63 </string> 63 </string>
64 <string name="TooltipNoName"> 64 <string name="LoginDownloadingClothing">
65 (名前なし) 65 服をダウンロードしています...
66 </string> 66 </string>
67 <string name="TooltipOwner"> 67 <string name="AgentLostConnection">
68 オーナー: 68 この地域には、問題が発生している可能性があります。 インターネット接続を確認してください。
69 </string> 69 </string>
70 <string name="TooltipPublic"> 70 <string name="TooltipPerson">
71 公共 71 人
72 </string> 72 </string>
73 <string name="TooltipIsGroup"> 73 <string name="TooltipNoName">
74 (グループ) 74 (名前なし)
75 </string> 75 </string>
76 <string name="TooltipFlagScript"> 76 <string name="TooltipOwner">
77 スクリプト 77 オーナー:
78 </string> 78 </string>
79 <string name="TooltipFlagPhysics"> 79 <string name="TooltipPublic">
80 物理作用 80 公共
81 </string> 81 </string>
82 <string name="TooltipFlagTouch"> 82 <string name="TooltipIsGroup">
83 触る 83 (グループ)
84 </string> 84 </string>
85 <string name="TooltipFlagL$"> 85 <string name="TooltipFlagScript">
86 L$ 86 スクリプト
87 </string> 87 </string>
88 <string name="TooltipFlagDropInventory"> 88 <string name="TooltipFlagPhysics">
89 持ち物をドロップする 89 物理作用
90 </string> 90 </string>
91 <string name="TooltipFlagPhantom"> 91 <string name="TooltipFlagTouch">
92 ファントム 92 触る
93 </string> 93 </string>
94 <string name="TooltipFlagTemporary"> 94 <string name="TooltipFlagL$">
95 一時的 95 L$
96 </string> 96 </string>
97 <string name="TooltipFlagRightClickMenu"> 97 <string name="TooltipFlagDropInventory">
98 (右クリックでメニューを表示) 98 持ち物をドロップする
99 </string> 99 </string>
100 <string name="TooltipFreeToCopy"> 100 <string name="TooltipFlagPhantom">
101 コピー可能 101 ファントム
102 </string> 102 </string>
103 <string name="TooltipForSaleL$"> 103 <string name="TooltipFlagTemporary">
104 売り出し中:L$[AMOUNT] 104 一時的
105 </string> 105 </string>
106 <string name="TooltipForSaleMsg"> 106 <string name="TooltipFlagRightClickMenu">
107 売り出し中: [MESSAGE] 107 (右クリックでメニューを表示)
108 </string> 108 </string>
109 <string name="TooltipFlagGroupBuild"> 109 <string name="TooltipFreeToCopy">
110 グループ作成 110 コピー可能
111 </string> 111 </string>
112 <string name="TooltipFlagNoBuild"> 112 <string name="TooltipForSaleL$">
113 作成禁止 113 売り出し中:L$[AMOUNT]
114 </string> 114 </string>
115 <string name="TooltipFlagNoEdit"> 115 <string name="TooltipForSaleMsg">
116 グループ作成 116 売り出し中: [MESSAGE]
117 </string> 117 </string>
118 <string name="TooltipFlagNotSafe"> 118 <string name="TooltipFlagGroupBuild">
119 危険 119 グループ作成
120 </string> 120 </string>
121 <string name="TooltipFlagNoFly"> 121 <string name="TooltipFlagNoBuild">
122 飛行禁止 122 作成禁止
123 </string> 123 </string>
124 <string name="TooltipFlagGroupScripts"> 124 <string name="TooltipFlagNoEdit">
125 グループ・スクリプト 125 グループ作成
126 </string> 126 </string>
127 <string name="TooltipFlagNoScripts"> 127 <string name="TooltipFlagNotSafe">
128 スクリプトなし 128 危険
129 </string> 129 </string>
130 <string name="TooltipLand"> 130 <string name="TooltipFlagNoFly">
131 土地: 131 飛行禁止
132 </string> 132 </string>
133 <string name="TooltipMustSingleDrop"> 133 <string name="TooltipFlagGroupScripts">
134 1つのアイテムのみをここにドラッグできます 134 グループ・スクリプト
135 </string> 135 </string>
136 <string name="RetrievingData"> 136 <string name="TooltipFlagNoScripts">
137 検索中... 137 スクリプトなし
138 </string> 138 </string>
139 <string name="ReleaseNotes"> 139 <string name="TooltipLand">
140 リリースノート 140 土地:
141 </string> 141 </string>
142 <string name="LoadingData"> 142 <string name="TooltipMustSingleDrop">
143 ロード中... 143 1つのアイテムのみをここにドラッグできます
144 </string> 144 </string>
145 <string name="AvatarNameNobody"> 145 <string name="RetrievingData">
146 (無人) 146 検索中...
147 </string> 147 </string>
148 <string name="AvatarNameWaiting"> 148 <string name="ReleaseNotes">
149 (待機中) 149 リリースノート
150 </string> 150 </string>
151 <string name="AvatarNameHippos"> 151 <string name="LoadingData">
152 (カバ) 152 ロード中...
153 </string> 153 </string>
154 <string name="GroupNameNone"> 154 <string name="AvatarNameNobody">
155 (なし) 155 (無人)
156 </string> 156 </string>
157 <string name="AssetErrorNone"> 157 <string name="AvatarNameWaiting">
158 エラーなし 158 (待機中)
159 </string> 159 </string>
160 <string name="AssetErrorRequestFailed"> 160 <string name="AvatarNameHippos">
161 資産の要求: 失敗 161 (カバ)
162 </string> 162 </string>
163 <string name="AssetErrorNonexistentFile"> 163 <string name="GroupNameNone">
164 資産の要求: 存在しないファイル 164 (なし)
165 </string> 165 </string>
166 <string name="AssetErrorNotInDatabase"> 166 <string name="AssetErrorNone">
167 資産の要求: データベースでは見つからない資産 167 エラーなし
168 </string> 168 </string>
169 <string name="AssetErrorEOF"> 169 <string name="AssetErrorRequestFailed">
170 ファイルの終わり 170 資産の要求: 失敗
171 </string> 171 </string>
172 <string name="AssetErrorCannotOpenFile"> 172 <string name="AssetErrorNonexistentFile">
173 ファイルを開くことができません 173 資産の要求: 存在しないファイル
174 </string> 174 </string>
175 <string name="AssetErrorFileNotFound"> 175 <string name="AssetErrorNotInDatabase">
176 ファイルが見つかりません 176 資産の要求: データベースでは見つからない資産
177 </string> 177 </string>
178 <string name="AssetErrorTCPTimeout"> 178 <string name="AssetErrorEOF">
179 ファイル転送タイムアウトです 179 ファイルの終わり
180 </string> 180 </string>
181 <string name="AssetErrorCircuitGone"> 181 <string name="AssetErrorCannotOpenFile">
182 接続が解除されました 182 ファイルを開くことができません
183 </string> 183 </string>
184 <string name="AssetErrorPriceMismatch"> 184 <string name="AssetErrorFileNotFound">
185 ビューワとサーバーの価格が一致していません 185 ファイルが見つかりません
186 </string> 186 </string>
187 <string name="AssetErrorUnknownStatus"> 187 <string name="AssetErrorTCPTimeout">
188 ステータスが不明です 188 ファイル転送タイムアウトです
189 </string> 189 </string>
190 <string name="AvatarEditingApparance"> 190 <string name="AssetErrorCircuitGone">
191 (容姿の編集) 191 接続が解除されました
192 </string> 192 </string>
193 <string name="AvatarAway"> 193 <string name="AssetErrorPriceMismatch">
194 退席中 194 ビューワとサーバーの価格が一致していません
195 </string> 195 </string>
196 <string name="AvatarBusy"> 196 <string name="AssetErrorUnknownStatus">
197 取り込み中 197 ステータスが不明です
198 </string> 198 </string>
199 <string name="AvatarMuted"> 199 <string name="AvatarEditingApparance">
200 ミュート 200 (容姿の編集)
201 </string> 201 </string>
202 <string name="anim_express_afraid"> 202 <string name="AvatarAway">
203 怖れ 203 退席中
204 </string> 204 </string>
205 <string name="anim_express_anger"> 205 <string name="AvatarBusy">
206 怒り 206 取り込み中
207 </string> 207 </string>
208 <string name="anim_away"> 208 <string name="AvatarMuted">
209 退席中 209 ミュート
210 </string> 210 </string>
211 <string name="anim_backflip"> 211 <string name="anim_express_afraid">
212 後ろ宙返り 212 怖れ
213 </string> 213 </string>
214 <string name="anim_express_laugh"> 214 <string name="anim_express_anger">
215 大笑い 215 怒り
216 </string> 216 </string>
217 <string name="anim_express_toothsmile"> 217 <string name="anim_away">
218 満面の笑顔 218 退席中
219 </string> 219 </string>
220 <string name="anim_blowkiss"> 220 <string name="anim_backflip">
221 投げキッス 221 後ろ宙返り
222 </string> 222 </string>
223 <string name="anim_express_bored"> 223 <string name="anim_express_laugh">
224 退屈 224 大笑い
225 </string> 225 </string>
226 <string name="anim_bow"> 226 <string name="anim_express_toothsmile">
227 おじぎ 227 満面の笑顔
228 </string> 228 </string>
229 <string name="anim_clap"> 229 <string name="anim_blowkiss">
230 拍手 230 投げキッス
231 </string> 231 </string>
232 <string name="anim_courtbow"> 232 <string name="anim_express_bored">
233 深いおじぎ 233 退屈
234 </string> 234 </string>
235 <string name="anim_express_cry"> 235 <string name="anim_bow">
236 泣く 236 おじぎ
237 </string> 237 </string>
238 <string name="anim_dance1"> 238 <string name="anim_clap">
239 ダンス1 239 拍手
240 </string> 240 </string>
241 <string name="anim_dance2"> 241 <string name="anim_courtbow">
242 ダンス2 242 深いおじぎ
243 </string> 243 </string>
244 <string name="anim_dance3"> 244 <string name="anim_express_cry">
245 ダンス3 245 泣く
246 </string> 246 </string>
247 <string name="anim_dance4"> 247 <string name="anim_dance1">
248 ダンス4 248 ダンス1
249 </string> 249 </string>
250 <string name="anim_dance5"> 250 <string name="anim_dance2">
251 ダンス5 251 ダンス2
252 </string> 252 </string>
253 <string name="anim_dance6"> 253 <string name="anim_dance3">
254 ダンス6 254 ダンス3
255 </string> 255 </string>
256 <string name="anim_dance7"> 256 <string name="anim_dance4">
257 ダンス7 257 ダンス4
258 </string> 258 </string>
259 <string name="anim_dance8"> 259 <string name="anim_dance5">
260 ダンス8 260 ダンス5
261 </string> 261 </string>
262 <string name="anim_express_disdain"> 262 <string name="anim_dance6">
263 侮蔑 263 ダンス6
264 </string> 264 </string>
265 <string name="anim_drink"> 265 <string name="anim_dance7">
266 酔っぱらう 266 ダンス7
267 </string> 267 </string>
268 <string name="anim_express_embarrased"> 268 <string name="anim_dance8">
269 困惑 269 ダンス8
270 </string> 270 </string>
271 <string name="anim_angry_fingerwag"> 271 <string name="anim_express_disdain">
272 指を振る 272 侮蔑
273 </string> 273 </string>
274 <string name="anim_fist_pump"> 274 <string name="anim_drink">
275 ガッツポーズ 275 酔っぱらう
276 </string> 276 </string>
277 <string name="anim_yoga_float"> 277 <string name="anim_express_embarrased">
278 ヨガ浮遊 278 困惑
279 </string> 279 </string>
280 <string name="anim_express_frown"> 280 <string name="anim_angry_fingerwag">
281 しかめっ面 281 指を振る
282 </string> 282 </string>
283 <string name="anim_impatient"> 283 <string name="anim_fist_pump">
284 いらいらする 284 ガッツポーズ
285 </string> 285 </string>
286 <string name="anim_jumpforjoy"> 286 <string name="anim_yoga_float">
287 飛び上がって喜ぶ 287 ヨガ浮遊
288 </string> 288 </string>
289 <string name="anim_kissmybutt"> 289 <string name="anim_express_frown">
290 挑発ポーズ 290 しかめっ面
291 </string> 291 </string>
292 <string name="anim_express_kiss"> 292 <string name="anim_impatient">
293 キス 293 いらいらする
294 </string> 294 </string>
295 <string name="anim_laugh_short"> 295 <string name="anim_jumpforjoy">
296 笑う 296 飛び上がって喜ぶ
297 </string> 297 </string>
298 <string name="anim_musclebeach"> 298 <string name="anim_kissmybutt">
299 力こぶを見せる 299 挑発ポーズ
300 </string> 300 </string>
301 <string name="anim_no_unhappy"> 301 <string name="anim_express_kiss">
302 不満げに否定する 302 キス
303 </string> 303 </string>
304 <string name="anim_no_head"> 304 <string name="anim_laugh_short">
305 否定する 305 笑う
306 </string> 306 </string>
307 <string name="anim_nyanya"> 307 <string name="anim_musclebeach">
308 冷やかす 308 力こぶを見せる
309 </string> 309 </string>
310 <string name="anim_punch_onetwo"> 310 <string name="anim_no_unhappy">
311 ワンツー・パンチ 311 不満げに否定する
312 </string> 312 </string>
313 <string name="anim_express_open_mouth"> 313 <string name="anim_no_head">
314 口を開けて驚く 314 否定する
315 </string> 315 </string>
316 <string name="anim_peace"> 316 <string name="anim_nyanya">
317 ピース・サイン 317 冷やかす
318 </string> 318 </string>
319 <string name="anim_point_you"> 319 <string name="anim_punch_onetwo">
320 他人を指差す 320 ワンツー・パンチ
321 </string> 321 </string>
322 <string name="anim_point_me"> 322 <string name="anim_express_open_mouth">
323 自分を指差す 323 口を開けて驚く
324 </string> 324 </string>
325 <string name="anim_punch_l"> 325 <string name="anim_peace">
326 左パンチ 326 ピース・サイン
327 </string> 327 </string>
328 <string name="anim_punch_r"> 328 <string name="anim_point_you">
329 右パンチ 329 他人を指差す
330 </string> 330 </string>
331 <string name="anim_rps_countdown"> 331 <string name="anim_point_me">
332 じゃんけんポーズ 332 自分を指差す
333 </string> 333 </string>
334 <string name="anim_rps_paper"> 334 <string name="anim_punch_l">
335 パー 335 左パンチ
336 </string> 336 </string>
337 <string name="anim_rps_rock"> 337 <string name="anim_punch_r">
338 グー 338 右パンチ
339 </string> 339 </string>
340 <string name="anim_rps_scissors"> 340 <string name="anim_rps_countdown">
341 チョキ 341 じゃんけんポーズ
342 </string> 342 </string>
343 <string name="anim_express_repulsed"> 343 <string name="anim_rps_paper">
344 嫌悪感 344 パー
345 </string> 345 </string>
346 <string name="anim_kick_roundhouse_r"> 346 <string name="anim_rps_rock">
347 まわし蹴り 347 グー
348 </string> 348 </string>
349 <string name="anim_express_sad"> 349 <string name="anim_rps_scissors">
350 悲しむ 350 チョキ
351 </string> 351 </string>
352 <string name="anim_salute"> 352 <string name="anim_express_repulsed">
353 敬礼する 353 嫌悪感
354 </string> 354 </string>
355 <string name="anim_shout"> 355 <string name="anim_kick_roundhouse_r">
356 叫ぶ 356 まわし蹴り
357 </string> 357 </string>
358 <string name="anim_express_shrug"> 358 <string name="anim_express_sad">
359 肩をすくめる 359 悲しむ
360 </string> 360 </string>
361 <string name="anim_express_smile"> 361 <string name="anim_salute">
362 微笑む 362 敬礼する
363 </string> 363 </string>
364 <string name="anim_smoke_idle"> 364 <string name="anim_shout">
365 たばこをくゆらす 365 叫ぶ
366 </string> 366 </string>
367 <string name="anim_smoke_inhale"> 367 <string name="anim_express_shrug">
368 たばこを吸う 368 肩をすくめる
369 </string> 369 </string>
370 <string name="anim_smoke_throw_down"> 370 <string name="anim_express_smile">
371 たばこを捨てる 371 微笑む
372 </string> 372 </string>
373 <string name="anim_express_surprise"> 373 <string name="anim_smoke_idle">
374 驚く 374 たばこをくゆらす
375 </string> 375 </string>
376 <string name="anim_sword_strike_r"> 376 <string name="anim_smoke_inhale">
377 剣で斬りつける 377 たばこを吸う
378 </string> 378 </string>
379 <string name="anim_angry_tantrum"> 379 <string name="anim_smoke_throw_down">
380 じだんだを踏む 380 たばこを捨てる
381 </string> 381 </string>
382 <string name="anim_express_tongue_out"> 382 <string name="anim_express_surprise">
383 舌を出す 383 驚く
384 </string> 384 </string>
385 <string name="anim_hello"> 385 <string name="anim_sword_strike_r">
386 手を振る 386 剣で斬りつける
387 </string> 387 </string>
388 <string name="anim_whisper"> 388 <string name="anim_angry_tantrum">
389 小声で話す 389 じだんだを踏む
390 </string> 390 </string>
391 <string name="anim_whistle"> 391 <string name="anim_express_tongue_out">
392 口笛を吹く 392 舌を出す
393 </string> 393 </string>
394 <string name="anim_express_wink"> 394 <string name="anim_hello">
395 ウィンク 395 手を振る
396 </string> 396 </string>
397 <string name="anim_wink_hollywood"> 397 <string name="anim_whisper">
398 ウィンク(ハリウッド) 398 小声で話す
399 </string> 399 </string>
400 <string name="anim_express_worry"> 400 <string name="anim_whistle">
401 心配する 401 口笛を吹く
402 </string> 402 </string>
403 <string name="anim_yes_happy"> 403 <string name="anim_express_wink">
404 笑顔で頷く 404 ウィンク
405 </string> 405 </string>
406 <string name="anim_yes_head"> 406 <string name="anim_wink_hollywood">
407 頷く 407 ウィンク(ハリウッド)
408 </string> 408 </string>
409 <string name="texture_loading"> 409 <string name="anim_express_worry">
410 ロード中... 410 心配する
411 </string> 411 </string>
412 <string name="worldmap_offline"> 412 <string name="anim_yes_happy">
413 オフライン 413 笑顔で頷く
414 </string> 414 </string>
415 <string name="whisper"> 415 <string name="anim_yes_head">
416 のささやき: 416 頷く
417 </string> 417 </string>
418 <string name="shout"> 418 <string name="texture_loading">
419 の叫び: 419 ロード中...
420 </string> 420 </string>
421 <string name="SIM_ACCESS_PG"> 421 <string name="worldmap_offline">
422 PG 422 オフライン
423 </string> 423 </string>
424 <string name="SIM_ACCESS_MATURE"> 424 <string name="whisper">
425 Mature 425 のささやき:
426 </string> 426 </string>
427 <string name="SIM_ACCESS_ADULT"> 427 <string name="shout">
428 Adult 428 の叫び:
429 </string> 429 </string>
430 <string name="SIM_ACCESS_DOWN"> 430 <string name="SIM_ACCESS_PG">
431 オフライン 431 PG
432 </string> 432 </string>
433 <string name="SIM_ACCESS_MIN"> 433 <string name="SIM_ACCESS_MATURE">
434 不明 434 Mature
435 </string> 435 </string>
436 <string name="land_type_unknown"> 436 <string name="SIM_ACCESS_ADULT">
437 （不明） 437 Adult
438 </string> 438 </string>
439 <string name="covenant_never_modified"> 439 <string name="SIM_ACCESS_DOWN">
440 最終修正： （無） 440 オフライン
441 </string> 441 </string>
442 <string name="covenant_modified"> 442 <string name="SIM_ACCESS_MIN">
443 最終修正： 443 不明
444 </string> 444 </string>
445 <string name="all_files"> 445 <string name="land_type_unknown">
446 全てのファイル 446 （不明）
447 </string> 447 </string>
448 <string name="sound_files"> 448 <string name="covenant_never_modified">
449 サウンド 449 最終修正： （無）
450 </string> 450 </string>
451 <string name="animation_files"> 451 <string name="covenant_modified">
452 アニメーション 452 最終修正：
453 </string> 453 </string>
454 <string name="image_files"> 454 <string name="all_files">
455 画像 455 全てのファイル
456 </string> 456 </string>
457 <string name="save_file_verb"> 457 <string name="sound_files">
458 保存 458 サウンド
459 </string> 459 </string>
460 <string name="load_file_verb"> 460 <string name="animation_files">
461 ロード 461 アニメーション
462 </string> 462 </string>
463 <string name="targa_image_files"> 463 <string name="image_files">
464 Targa画像 464 画像
465 </string> 465 </string>
466 <string name="bitmap_image_files"> 466 <string name="save_file_verb">
467 ビットマップ画像 467 保存
468 </string> 468 </string>
469 <string name="avi_movie_file"> 469 <string name="load_file_verb">
470 AVIムービーファイル 470 ロード
471 </string> 471 </string>
472 <string name="xaf_animation_file"> 472 <string name="targa_image_files">
473 XAFアニメーションファイル 473 Targa画像
474 </string> 474 </string>
475 <string name="xml_file"> 475 <string name="bitmap_image_files">
476 XMLファイル 476 ビットマップ画像
477 </string> 477 </string>
478 <string name="dot_raw_file"> 478 <string name="avi_movie_file">
479 RAWファイル 479 AVIムービーファイル
480 </string> 480 </string>
481 <string name="compressed_image_files"> 481 <string name="xaf_animation_file">
482 圧縮画像 482 XAFアニメーションファイル
483 </string> 483 </string>
484 <string name="load_files"> 484 <string name="xml_file">
485 ファイルのロード 485 XMLファイル
486 </string> 486 </string>
487 <string name="choose_the_directory"> 487 <string name="dot_raw_file">
488 参照 488 RAWファイル
489 </string> 489 </string>
490</strings> 490 <string name="compressed_image_files">
491 圧縮画像
492 </string>
493 <string name="load_files">
494 ファイルのロード
495 </string>
496 <string name="choose_the_directory">
497 参照
498 </string>
499</strings>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml
index bc3bb85..06d0cc5 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml
@@ -12,12 +12,6 @@
12 <text type="string" length="12" name="TimeText" tool_tip="현재 시간(태평양 표준시)"> 12 <text type="string" length="12" name="TimeText" tool_tip="현재 시간(태평양 표준시)">
13 12:00 AM 13 12:00 AM
14 </text> 14 </text>
15 <text name="StatBarDaysOfWeek">
16 월요일:화요일:수요일:목요일:금요일:토요일
17 </text>
18 <text name="StatBarMonthsOfYear">
19 1월:2월:3월:4월:5월:6월:7월:8월:9월:10월:11월:12월
20 </text>
21 <button label="" label_selected="" name="scriptout" 15 <button label="" label_selected="" name="scriptout"
22 tool_tip="스크립트 경고 및 오류" /> 16 tool_tip="스크립트 경고 및 오류" />
23 <button label="" label_selected="" name="health" tool_tip="건강" /> 17 <button label="" label_selected="" name="health" tool_tip="건강" />
diff --git a/linden/indra/newview/skins/default/xui/ko/strings.xml b/linden/indra/newview/skins/default/xui/ko/strings.xml
index b7732bf..a461c92 100644
--- a/linden/indra/newview/skins/default/xui/ko/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <text name="StatBarDaysOfWeek">
10 월요일:화요일:수요일:목요일:금요일:토요일
11 </text>
12 <text name="StatBarMonthsOfYear">
13 1월:2월:3월:4월:5월:6월:7월:8월:9월:10월:11월:12월
14 </text>
15
7 <!-- Login --> 16 <!-- Login -->
8 <string name="LoginInProgress"> 17 <string name="LoginInProgress">
9 로그인 중. [APP_NAME]님은 정지된 상태로 나타날 수 있습니다. 잠시만 기다리십시오. 18 로그인 중. [APP_NAME]님은 정지된 상태로 나타날 수 있습니다. 잠시만 기다리십시오.
diff --git a/linden/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/pl/panel_status_bar.xml
index bdf22fa..456b2f4 100755
--- a/linden/indra/newview/skins/default/xui/pl/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/pl/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text type="string" length="12" name="TimeText" tool_tip="Obecny Czas (Pacyficzny)"> 10 <text type="string" length="12" name="TimeText" tool_tip="Obecny Czas (Pacyficzny)">
11 12:00 AM 11 12:00 AM
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek">
14 Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota
15 </string>
16 <string name="StatBarMonthsOfYear">
17 Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Styczeń:Wrzesień:Październik:Listopad:Grudzień
18 </string>
19 <button label="" label_selected="" name="scriptout" tool_tip="Błędy i Ostrzeżenia Skryptów" /> 13 <button label="" label_selected="" name="scriptout" tool_tip="Błędy i Ostrzeżenia Skryptów" />
20 <button label="" label_selected="" name="health" tool_tip="Stan" /> 14 <button label="" label_selected="" name="health" tool_tip="Stan" />
21 <text type="string" length="1" name="HealthText" tool_tip="Stan"> 15 <text type="string" length="1" name="HealthText" tool_tip="Stan">
diff --git a/linden/indra/newview/skins/default/xui/pl/strings.xml b/linden/indra/newview/skins/default/xui/pl/strings.xml
index 5067f04..325fe79 100755
--- a/linden/indra/newview/skins/default/xui/pl/strings.xml
+++ b/linden/indra/newview/skins/default/xui/pl/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Styczeń:Wrzesień:Październik:Listopad:Grudzień
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Trwa logowanie. [APP_NAME] Proszę czekać. 17 Trwa logowanie. [APP_NAME] Proszę czekać.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 1b88913..93d1d43 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,38 +1,32 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<panel name="status"> 2<panel name="status">
3 <text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você está. Clique Sobre a Terra para informações." type="string"> 3 <text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você está. Clique Sobre a Terra para informações." type="string">
4 Nome do pedaço de terra vai aqui 4 Nome do pedaço de terra vai aqui
5 </text> 5 </text>
6 <text length="1" name="BalanceText" tool_tip="Saldo" type="string"> 6 <text length="1" name="BalanceText" tool_tip="Saldo" type="string">
7 Carregando... 7 Carregando...
8 </text> 8 </text>
9 <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinheiro"/> 9 <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinheiro"/>
10 <text length="12" name="TimeText" tool_tip="Hora atual (do Pacífico)" type="string"> 10 <text length="12" name="TimeText" tool_tip="Hora atual (do Pacífico)" type="string">
11 12:00 AM 11 12:00 AM
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek"> 13 <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/>
14 Domingo:Segunda-feira:Terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado 14 <button label="" label_selected="" name="health" tool_tip="Saúde"/>
15 </string> 15 <text length="1" name="HealthText" tool_tip="Saúde" type="string">
16 <string name="StatBarMonthsOfYear"> 16 100%
17 Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro 17 </text>
18 </string> 18 <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/>
19 <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/> 19 <button label="" label_selected="" name="no_build" tool_tip="Construir/Rezzar não permitido"/>
20 <button label="" label_selected="" name="health" tool_tip="Saúde"/> 20 <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/>
21 <text length="1" name="HealthText" tool_tip="Saúde" type="string"> 21 <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/>
22 100% 22 <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponível aqui"/>
23 </text> 23 <button label="" label_selected="" name="buyland" tool_tip="Comprar este lote"/>
24 <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/> 24 <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/>
25 <button label="" label_selected="" name="no_build" tool_tip="Construir/Rezzar não permitido"/> 25 <button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/>
26 <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/> 26 <string name="packet_loss_tooltip">
27 <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/> 27 Perda de pacote
28 <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponível aqui"/> 28 </string>
29 <button label="" label_selected="" name="buyland" tool_tip="Comprar este lote"/> 29 <string name="bandwidth_tooltip">
30 <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/> 30 Banda
31 <button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/> 31 </string>
32 <string name="packet_loss_tooltip"> 32</panel>
33 Perda de pacote
34 </string>
35 <string name="bandwidth_tooltip">
36 Banda
37 </string>
38</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/strings.xml b/linden/indra/newview/skins/default/xui/pt/strings.xml
index a0888ac..7f0b8a8 100644
--- a/linden/indra/newview/skins/default/xui/pt/strings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/strings.xml
@@ -1,486 +1,495 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<!-- This file contains strings that used to be hardcoded in the source. 2<!-- This file contains strings that used to be hardcoded in the source.
3 It is only for those strings which do not belong in a floater. 3 It is only for those strings which do not belong in a floater.
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7 <string name="LoginInProgress"> 7
8 Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde. 8 <!-- Imprudence-specific strings -->
9 </string> 9 <string name="StatBarDaysOfWeek">
10 <string name="LoginAuthenticating"> 10 Domingo:Segunda-feira:Terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
11 Autenticando 11 </string>
12 </string> 12 <string name="StatBarMonthsOfYear">
13 <string name="LoginMaintenance"> 13 Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro
14 Executando manutenção da conta... 14 </string>
15 </string> 15
16 <string name="LoginAttempt"> 16 <string name="LoginInProgress">
17 Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER] 17 Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
18 </string> 18 </string>
19 <string name="LoginPrecaching"> 19 <string name="LoginAuthenticating">
20 Carregando mundo... 20 Autenticando
21 </string> 21 </string>
22 <string name="LoginInitializingBrowser"> 22 <string name="LoginMaintenance">
23 Inicializando navegador embutido... 23 Executando manutenção da conta...
24 </string> 24 </string>
25 <string name="LoginInitializingMultimedia"> 25 <string name="LoginAttempt">
26 Inicializando multimídia... 26 Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]
27 </string> 27 </string>
28 <string name="LoginVerifyingCache"> 28 <string name="LoginPrecaching">
29 Verificando arquivos no cache (pode levar 60-90 segundos)... 29 Carregando mundo...
30 </string> 30 </string>
31 <string name="LoginProcessingResponse"> 31 <string name="LoginInitializingBrowser">
32 Processando Resposta... 32 Inicializando navegador embutido...
33 </string> 33 </string>
34 <string name="LoginInitializingWorld"> 34 <string name="LoginInitializingMultimedia">
35 Inicializando Mundo... 35 Inicializando multimídia...
36 </string> 36 </string>
37 <string name="LoginDecodingImages"> 37 <string name="LoginVerifyingCache">
38 Decodificando imagens... 38 Verificando arquivos no cache (pode levar 60-90 segundos)...
39 </string> 39 </string>
40 <string name="LoginInitializingQuicktime"> 40 <string name="LoginProcessingResponse">
41 Inicializando o QuickTime... 41 Processando Resposta...
42 </string> 42 </string>
43 <string name="LoginQuicktimeNotFound"> 43 <string name="LoginInitializingWorld">
44 O QuickTime não foi encontrado - incapaz de inicializar. 44 Inicializando Mundo...
45 </string> 45 </string>
46 <string name="LoginQuicktimeOK"> 46 <string name="LoginDecodingImages">
47 O QuickTime foi inicializado com sucesso. 47 Decodificando imagens...
48 </string> 48 </string>
49 <string name="LoginWaitingForRegionHandshake"> 49 <string name="LoginInitializingQuicktime">
50 Aguardando o handshake com a região... 50 Inicializando o QuickTime...
51 </string> 51 </string>
52 <string name="LoginConnectingToRegion"> 52 <string name="LoginQuicktimeNotFound">
53 Conectando à região... 53 O QuickTime não foi encontrado - incapaz de inicializar.
54 </string> 54 </string>
55 <string name="LoginDownloadingClothing"> 55 <string name="LoginQuicktimeOK">
56 Baixando roupas... 56 O QuickTime foi inicializado com sucesso.
57 </string> 57 </string>
58 <string name="AgentLostConnection"> 58 <string name="LoginWaitingForRegionHandshake">
59 Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet. 59 Aguardando o handshake com a região...
60 </string> 60 </string>
61 <string name="TooltipPerson"> 61 <string name="LoginConnectingToRegion">
62 Pessoa 62 Conectando à região...
63 </string> 63 </string>
64 <string name="TooltipNoName"> 64 <string name="LoginDownloadingClothing">
65 (sem nome) 65 Baixando roupas...
66 </string> 66 </string>
67 <string name="TooltipOwner"> 67 <string name="AgentLostConnection">
68 Proprietário: 68 Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
69 </string> 69 </string>
70 <string name="TooltipPublic"> 70 <string name="TooltipPerson">
71 Público 71 Pessoa
72 </string> 72 </string>
73 <string name="TooltipIsGroup"> 73 <string name="TooltipNoName">
74 (Grupo) 74 (sem nome)
75 </string> 75 </string>
76 <string name="TooltipFlagScript"> 76 <string name="TooltipOwner">
77 Script 77 Proprietário:
78 </string> 78 </string>
79 <string name="TooltipFlagPhysics"> 79 <string name="TooltipPublic">
80 Física 80 Público
81 </string> 81 </string>
82 <string name="TooltipFlagTouch"> 82 <string name="TooltipIsGroup">
83 Toque 83 (Grupo)
84 </string> 84 </string>
85 <string name="TooltipFlagL$"> 85 <string name="TooltipFlagScript">
86 L$ 86 Script
87 </string> 87 </string>
88 <string name="TooltipFlagDropInventory"> 88 <string name="TooltipFlagPhysics">
89 Dar Inventário 89 Física
90 </string> 90 </string>
91 <string name="TooltipFlagPhantom"> 91 <string name="TooltipFlagTouch">
92 Imaterial 92 Toque
93 </string> 93 </string>
94 <string name="TooltipFlagTemporary"> 94 <string name="TooltipFlagL$">
95 Temporário 95 L$
96 </string> 96 </string>
97 <string name="TooltipFlagRightClickMenu"> 97 <string name="TooltipFlagDropInventory">
98 (Clique com o botão direito para acessar o menu) 98 Dar Inventário
99 </string> 99 </string>
100 <string name="TooltipFreeToCopy"> 100 <string name="TooltipFlagPhantom">
101 Cópia Permitida 101 Imaterial
102 </string> 102 </string>
103 <string name="TooltipForSaleL$"> 103 <string name="TooltipFlagTemporary">
104 À venda: L$[AMOUNT] 104 Temporário
105 </string> 105 </string>
106 <string name="TooltipForSaleMsg"> 106 <string name="TooltipFlagRightClickMenu">
107 À venda: [MESSAGE] 107 (Clique com o botão direito para acessar o menu)
108 </string> 108 </string>
109 <string name="TooltipFlagGroupBuild"> 109 <string name="TooltipFreeToCopy">
110 Construído por Grupo 110 Cópia Permitida
111 </string> 111 </string>
112 <string name="TooltipFlagNoBuild"> 112 <string name="TooltipForSaleL$">
113 Não é Permitido Construir 113 À venda: L$[AMOUNT]
114 </string> 114 </string>
115 <string name="TooltipFlagNoEdit"> 115 <string name="TooltipForSaleMsg">
116 Construído por Grupo 116 À venda: [MESSAGE]
117 </string> 117 </string>
118 <string name="TooltipFlagNotSafe"> 118 <string name="TooltipFlagGroupBuild">
119 Não é Seguro 119 Construído por Grupo
120 </string> 120 </string>
121 <string name="TooltipFlagNoFly"> 121 <string name="TooltipFlagNoBuild">
122 Não é Permitido Voar 122 Não é Permitido Construir
123 </string> 123 </string>
124 <string name="TooltipFlagGroupScripts"> 124 <string name="TooltipFlagNoEdit">
125 Scripts de Grupo 125 Construído por Grupo
126 </string> 126 </string>
127 <string name="TooltipFlagNoScripts"> 127 <string name="TooltipFlagNotSafe">
128 Não são Permitidos Scripts 128 Não é Seguro
129 </string> 129 </string>
130 <string name="TooltipLand"> 130 <string name="TooltipFlagNoFly">
131 Terreno: 131 Não é Permitido Voar
132 </string> 132 </string>
133 <string name="TooltipMustSingleDrop"> 133 <string name="TooltipFlagGroupScripts">
134 Apenas um item único pode ser arrastado para este local 134 Scripts de Grupo
135 </string> 135 </string>
136 <string name="RetrievingData"> 136 <string name="TooltipFlagNoScripts">
137 Buscando... 137 Não são Permitidos Scripts
138 </string> 138 </string>
139 <string name="ReleaseNotes"> 139 <string name="TooltipLand">
140 Notas de Distribuição 140 Terreno:
141 </string> 141 </string>
142 <string name="LoadingData"> 142 <string name="TooltipMustSingleDrop">
143 Carregando... 143 Apenas um item único pode ser arrastado para este local
144 </string> 144 </string>
145 <string name="AvatarNameNobody"> 145 <string name="RetrievingData">
146 (ninguém) 146 Buscando...
147 </string> 147 </string>
148 <string name="AvatarNameWaiting"> 148 <string name="ReleaseNotes">
149 (aguardando) 149 Notas de Distribuição
150 </string> 150 </string>
151 <string name="AvatarNameHippos"> 151 <string name="LoadingData">
152 (hippos) 152 Carregando...
153 </string> 153 </string>
154 <string name="GroupNameNone"> 154 <string name="AvatarNameNobody">
155 (nenhum) 155 (ninguém)
156 </string> 156 </string>
157 <string name="AssetErrorNone"> 157 <string name="AvatarNameWaiting">
158 Nenhum erro 158 (aguardando)
159 </string> 159 </string>
160 <string name="AssetErrorRequestFailed"> 160 <string name="AvatarNameHippos">
161 Item pedido falhou 161 (hippos)
162 </string> 162 </string>
163 <string name="AssetErrorNonexistentFile"> 163 <string name="GroupNameNone">
164 Item pedido: arquivo inexistente 164 (nenhum)
165 </string> 165 </string>
166 <string name="AssetErrorNotInDatabase"> 166 <string name="AssetErrorNone">
167 Item pedido: item não encontrado na base de dados. 167 Nenhum erro
168 </string> 168 </string>
169 <string name="AssetErrorEOF"> 169 <string name="AssetErrorRequestFailed">
170 Fim do arquivo 170 Item pedido falhou
171 </string> 171 </string>
172 <string name="AssetErrorCannotOpenFile"> 172 <string name="AssetErrorNonexistentFile">
173 Não é possível abrir arquivo 173 Item pedido: arquivo inexistente
174 </string> 174 </string>
175 <string name="AssetErrorFileNotFound"> 175 <string name="AssetErrorNotInDatabase">
176 Arquivo não encontrado 176 Item pedido: item não encontrado na base de dados.
177 </string> 177 </string>
178 <string name="AssetErrorTCPTimeout"> 178 <string name="AssetErrorEOF">
179 Tempo de transferência de arquivo expirado 179 Fim do arquivo
180 </string> 180 </string>
181 <string name="AssetErrorCircuitGone"> 181 <string name="AssetErrorCannotOpenFile">
182 Circuito caiu 182 Não é possível abrir arquivo
183 </string> 183 </string>
184 <string name="AssetErrorPriceMismatch"> 184 <string name="AssetErrorFileNotFound">
185 Visualizador e servidor não concordam no preço 185 Arquivo não encontrado
186 </string> 186 </string>
187 <string name="AssetErrorUnknownStatus"> 187 <string name="AssetErrorTCPTimeout">
188 Status desconhecido 188 Tempo de transferência de arquivo expirado
189 </string> 189 </string>
190 <string name="AvatarEditingApparance"> 190 <string name="AssetErrorCircuitGone">
191 (Editando Aparência) 191 Circuito caiu
192 </string> 192 </string>
193 <string name="AvatarAway"> 193 <string name="AssetErrorPriceMismatch">
194 Distante 194 Visualizador e servidor não concordam no preço
195 </string> 195 </string>
196 <string name="AvatarBusy"> 196 <string name="AssetErrorUnknownStatus">
197 Ocupado 197 Status desconhecido
198 </string> 198 </string>
199 <string name="AvatarMuted"> 199 <string name="AvatarEditingApparance">
200 Mudo 200 (Editando Aparência)
201 </string> 201 </string>
202 <string name="anim_express_afraid"> 202 <string name="AvatarAway">
203 Temeroso 203 Distante
204 </string> 204 </string>
205 <string name="anim_express_anger"> 205 <string name="AvatarBusy">
206 Bravo 206 Ocupado
207 </string> 207 </string>
208 <string name="anim_away"> 208 <string name="AvatarMuted">
209 Distante 209 Mudo
210 </string> 210 </string>
211 <string name="anim_backflip"> 211 <string name="anim_express_afraid">
212 Virar para trás 212 Temeroso
213 </string> 213 </string>
214 <string name="anim_express_laugh"> 214 <string name="anim_express_anger">
215 Rir segurando a barriga 215 Bravo
216 </string> 216 </string>
217 <string name="anim_express_toothsmile"> 217 <string name="anim_away">
218 Sorriso largo 218 Distante
219 </string> 219 </string>
220 <string name="anim_blowkiss"> 220 <string name="anim_backflip">
221 Mandar beijo 221 Virar para trás
222 </string> 222 </string>
223 <string name="anim_express_bored"> 223 <string name="anim_express_laugh">
224 Entediado 224 Rir segurando a barriga
225 </string> 225 </string>
226 <string name="anim_bow"> 226 <string name="anim_express_toothsmile">
227 Saudar curvando 227 Sorriso largo
228 </string> 228 </string>
229 <string name="anim_clap"> 229 <string name="anim_blowkiss">
230 Aplaudir 230 Mandar beijo
231 </string> 231 </string>
232 <string name="anim_courtbow"> 232 <string name="anim_express_bored">
233 Saudação formal 233 Entediado
234 </string> 234 </string>
235 <string name="anim_express_cry"> 235 <string name="anim_bow">
236 Chorar 236 Saudar curvando
237 </string> 237 </string>
238 <string name="anim_dance1"> 238 <string name="anim_clap">
239 Dança 1 239 Aplaudir
240 </string> 240 </string>
241 <string name="anim_dance2"> 241 <string name="anim_courtbow">
242 Dança 2 242 Saudação formal
243 </string> 243 </string>
244 <string name="anim_dance3"> 244 <string name="anim_express_cry">
245 Dança 3 245 Chorar
246 </string> 246 </string>
247 <string name="anim_dance4"> 247 <string name="anim_dance1">
248 Dança 4 248 Dança 1
249 </string> 249 </string>
250 <string name="anim_dance5"> 250 <string name="anim_dance2">
251 Dança 5 251 Dança 2
252 </string> 252 </string>
253 <string name="anim_dance6"> 253 <string name="anim_dance3">
254 Dança 6 254 Dança 3
255 </string> 255 </string>
256 <string name="anim_dance7"> 256 <string name="anim_dance4">
257 Dança 7 257 Dança 4
258 </string> 258 </string>
259 <string name="anim_dance8"> 259 <string name="anim_dance5">
260 Dança 8 260 Dança 5
261 </string> 261 </string>
262 <string name="anim_express_disdain"> 262 <string name="anim_dance6">
263 Desdém 263 Dança 6
264 </string> 264 </string>
265 <string name="anim_drink"> 265 <string name="anim_dance7">
266 Beber 266 Dança 7
267 </string> 267 </string>
268 <string name="anim_express_embarrased"> 268 <string name="anim_dance8">
269 Envergonhado 269 Dança 8
270 </string> 270 </string>
271 <string name="anim_angry_fingerwag"> 271 <string name="anim_express_disdain">
272 Negar com o dedo. 272 Desdém
273 </string> 273 </string>
274 <string name="anim_fist_pump"> 274 <string name="anim_drink">
275 Vibrar provocando 275 Beber
276 </string> 276 </string>
277 <string name="anim_yoga_float"> 277 <string name="anim_express_embarrased">
278 Levitar Yoga 278 Envergonhado
279 </string> 279 </string>
280 <string name="anim_express_frown"> 280 <string name="anim_angry_fingerwag">
281 Careta 281 Negar com o dedo.
282 </string> 282 </string>
283 <string name="anim_impatient"> 283 <string name="anim_fist_pump">
284 Impaciente 284 Vibrar provocando
285 </string> 285 </string>
286 <string name="anim_jumpforjoy"> 286 <string name="anim_yoga_float">
287 Pular de Alegria 287 Levitar Yoga
288 </string> 288 </string>
289 <string name="anim_kissmybutt"> 289 <string name="anim_express_frown">
290 Beije meu Bumbum 290 Careta
291 </string> 291 </string>
292 <string name="anim_express_kiss"> 292 <string name="anim_impatient">
293 Beijar 293 Impaciente
294 </string> 294 </string>
295 <string name="anim_laugh_short"> 295 <string name="anim_jumpforjoy">
296 Rir 296 Pular de Alegria
297 </string> 297 </string>
298 <string name="anim_musclebeach"> 298 <string name="anim_kissmybutt">
299 Exibir músculos 299 Beije meu Bumbum
300 </string> 300 </string>
301 <string name="anim_no_unhappy"> 301 <string name="anim_express_kiss">
302 Não (descontente) 302 Beijar
303 </string> 303 </string>
304 <string name="anim_no_head"> 304 <string name="anim_laugh_short">
305 Não 305 Rir
306 </string> 306 </string>
307 <string name="anim_nyanya"> 307 <string name="anim_musclebeach">
308 Nya-nya-nya 308 Exibir músculos
309 </string> 309 </string>
310 <string name="anim_punch_onetwo"> 310 <string name="anim_no_unhappy">
311 Soco Um-Dois 311 Não (descontente)
312 </string> 312 </string>
313 <string name="anim_express_open_mouth"> 313 <string name="anim_no_head">
314 Abrir a boca 314 Não
315 </string> 315 </string>
316 <string name="anim_peace"> 316 <string name="anim_nyanya">
317 Paz 317 Nya-nya-nya
318 </string> 318 </string>
319 <string name="anim_point_you"> 319 <string name="anim_punch_onetwo">
320 Apontar para o outro 320 Soco Um-Dois
321 </string> 321 </string>
322 <string name="anim_point_me"> 322 <string name="anim_express_open_mouth">
323 Apontar para si 323 Abrir a boca
324 </string> 324 </string>
325 <string name="anim_punch_l"> 325 <string name="anim_peace">
326 Socar Esquerda 326 Paz
327 </string> 327 </string>
328 <string name="anim_punch_r"> 328 <string name="anim_point_you">
329 Socar Direita 329 Apontar para o outro
330 </string> 330 </string>
331 <string name="anim_rps_countdown"> 331 <string name="anim_point_me">
332 RPS contar 332 Apontar para si
333 </string> 333 </string>
334 <string name="anim_rps_paper"> 334 <string name="anim_punch_l">
335 RPS papel 335 Socar Esquerda
336 </string> 336 </string>
337 <string name="anim_rps_rock"> 337 <string name="anim_punch_r">
338 RPS pedra 338 Socar Direita
339 </string> 339 </string>
340 <string name="anim_rps_scissors"> 340 <string name="anim_rps_countdown">
341 RPS tesoura 341 RPS contar
342 </string> 342 </string>
343 <string name="anim_express_repulsed"> 343 <string name="anim_rps_paper">
344 Repulsa 344 RPS papel
345 </string> 345 </string>
346 <string name="anim_kick_roundhouse_r"> 346 <string name="anim_rps_rock">
347 Chute giratório 347 RPS pedra
348 </string> 348 </string>
349 <string name="anim_express_sad"> 349 <string name="anim_rps_scissors">
350 Triste 350 RPS tesoura
351 </string> 351 </string>
352 <string name="anim_salute"> 352 <string name="anim_express_repulsed">
353 Saúde 353 Repulsa
354 </string> 354 </string>
355 <string name="anim_shout"> 355 <string name="anim_kick_roundhouse_r">
356 Gritar 356 Chute giratório
357 </string> 357 </string>
358 <string name="anim_express_shrug"> 358 <string name="anim_express_sad">
359 Encolher ombros 359 Triste
360 </string> 360 </string>
361 <string name="anim_express_smile"> 361 <string name="anim_salute">
362 Sorrir 362 Saúde
363 </string> 363 </string>
364 <string name="anim_smoke_idle"> 364 <string name="anim_shout">
365 Fumar à toa 365 Gritar
366 </string> 366 </string>
367 <string name="anim_smoke_inhale"> 367 <string name="anim_express_shrug">
368 Inalar Fumaça 368 Encolher ombros
369 </string> 369 </string>
370 <string name="anim_smoke_throw_down"> 370 <string name="anim_express_smile">
371 Expelir Fumaça 371 Sorrir
372 </string> 372 </string>
373 <string name="anim_express_surprise"> 373 <string name="anim_smoke_idle">
374 Surpresa 374 Fumar à toa
375 </string> 375 </string>
376 <string name="anim_sword_strike_r"> 376 <string name="anim_smoke_inhale">
377 Golpe de Espada 377 Inalar Fumaça
378 </string> 378 </string>
379 <string name="anim_angry_tantrum"> 379 <string name="anim_smoke_throw_down">
380 Enraivecer 380 Expelir Fumaça
381 </string> 381 </string>
382 <string name="anim_express_tongue_out"> 382 <string name="anim_express_surprise">
383 Mostrar a língua 383 Surpresa
384 </string> 384 </string>
385 <string name="anim_hello"> 385 <string name="anim_sword_strike_r">
386 Onda 386 Golpe de Espada
387 </string> 387 </string>
388 <string name="anim_whisper"> 388 <string name="anim_angry_tantrum">
389 Sussurrar 389 Enraivecer
390 </string> 390 </string>
391 <string name="anim_whistle"> 391 <string name="anim_express_tongue_out">
392 Assobiar 392 Mostrar a língua
393 </string> 393 </string>
394 <string name="anim_express_wink"> 394 <string name="anim_hello">
395 Piscar 395 Onda
396 </string> 396 </string>
397 <string name="anim_wink_hollywood"> 397 <string name="anim_whisper">
398 Piscar (Hollywood) 398 Sussurrar
399 </string> 399 </string>
400 <string name="anim_express_worry"> 400 <string name="anim_whistle">
401 Preocupar-se 401 Assobiar
402 </string> 402 </string>
403 <string name="anim_yes_happy"> 403 <string name="anim_express_wink">
404 Sim (Feliz) 404 Piscar
405 </string> 405 </string>
406 <string name="anim_yes_head"> 406 <string name="anim_wink_hollywood">
407 Sim 407 Piscar (Hollywood)
408 </string> 408 </string>
409 <string name="texture_loading"> 409 <string name="anim_express_worry">
410 Carregando... 410 Preocupar-se
411 </string> 411 </string>
412 <string name="worldmap_offline"> 412 <string name="anim_yes_happy">
413 Desconectado 413 Sim (Feliz)
414 </string> 414 </string>
415 <string name="whisper"> 415 <string name="anim_yes_head">
416 sussurra: 416 Sim
417 </string> 417 </string>
418 <string name="shout"> 418 <string name="texture_loading">
419 grita: 419 Carregando...
420 </string> 420 </string>
421 <string name="SIM_ACCESS_PG"> 421 <string name="worldmap_offline">
422 PG 422 Desconectado
423 </string> 423 </string>
424 <string name="SIM_ACCESS_MATURE"> 424 <string name="whisper">
425 Mature 425 sussurra:
426 </string> 426 </string>
427 <string name="SIM_ACCESS_ADULT"> 427 <string name="shout">
428 Adult 428 grita:
429 </string> 429 </string>
430 <string name="SIM_ACCESS_DOWN"> 430 <string name="SIM_ACCESS_PG">
431 Desconectado 431 PG
432 </string> 432 </string>
433 <string name="SIM_ACCESS_MIN"> 433 <string name="SIM_ACCESS_MATURE">
434 Desconhecido 434 Mature
435 </string> 435 </string>
436 <string name="land_type_unknown"> 436 <string name="SIM_ACCESS_ADULT">
437 (desconhecido) 437 Adult
438 </string> 438 </string>
439 <string name="covenant_never_modified">Última modificação: (nunca)</string> 439 <string name="SIM_ACCESS_DOWN">
440 <string name="covenant_modified">Última modificação: </string> 440 Desconectado
441 <string name="all_files"> 441 </string>
442 Todos os Arquivos 442 <string name="SIM_ACCESS_MIN">
443 </string> 443 Desconhecido
444 <string name="sound_files"> 444 </string>
445 Sons 445 <string name="land_type_unknown">
446 </string> 446 (desconhecido)
447 <string name="animation_files"> 447 </string>
448 Animações 448 <string name="covenant_never_modified">Última modificação: (nunca)</string>
449 </string> 449 <string name="covenant_modified">Última modificação: </string>
450 <string name="image_files"> 450 <string name="all_files">
451 Imagens 451 Todos os Arquivos
452 </string> 452 </string>
453 <string name="save_file_verb"> 453 <string name="sound_files">
454 Salvar 454 Sons
455 </string> 455 </string>
456 <string name="load_file_verb"> 456 <string name="animation_files">
457 Carregar 457 Animações
458 </string> 458 </string>
459 <string name="targa_image_files"> 459 <string name="image_files">
460 Imagens Targa 460 Imagens
461 </string> 461 </string>
462 <string name="bitmap_image_files"> 462 <string name="save_file_verb">
463 Imagens Bitmap 463 Salvar
464 </string> 464 </string>
465 <string name="avi_movie_file"> 465 <string name="load_file_verb">
466 Arquivo de filme AVI 466 Carregar
467 </string> 467 </string>
468 <string name="xaf_animation_file"> 468 <string name="targa_image_files">
469 Arquivo de Animação XAF 469 Imagens Targa
470 </string> 470 </string>
471 <string name="xml_file"> 471 <string name="bitmap_image_files">
472 Arquivo XML 472 Imagens Bitmap
473 </string> 473 </string>
474 <string name="dot_raw_file"> 474 <string name="avi_movie_file">
475 Arquivo RAW 475 Arquivo de filme AVI
476 </string> 476 </string>
477 <string name="compressed_image_files"> 477 <string name="xaf_animation_file">
478 Imagens Compactadas 478 Arquivo de Animação XAF
479 </string> 479 </string>
480 <string name="load_files"> 480 <string name="xml_file">
481 Carregar Arquivos 481 Arquivo XML
482 </string> 482 </string>
483 <string name="choose_the_directory"> 483 <string name="dot_raw_file">
484 Escolher Diretório 484 Arquivo RAW
485 </string> 485 </string>
486</strings> 486 <string name="compressed_image_files">
487 Imagens Compactadas
488 </string>
489 <string name="load_files">
490 Carregar Arquivos
491 </string>
492 <string name="choose_the_directory">
493 Escolher Diretório
494 </string>
495</strings>
diff --git a/linden/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/ru/panel_status_bar.xml
index 1af4cbf..12a8d9d 100644
--- a/linden/indra/newview/skins/default/xui/ru/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ru/panel_status_bar.xml
@@ -13,12 +13,6 @@
13 tool_tip="Текущее время (тихоокеанское)"> 13 tool_tip="Текущее время (тихоокеанское)">
14 12:00 AM 14 12:00 AM
15 </text> 15 </text>
16 <string name="StatBarDaysOfWeek">
17 Воскр.:Понед.:Вторник:Среда:Четверг:Пятница:Суббота
18 </string>
19 <string name="StatBarMonthsOfYear">
20 Январь:Февраль:Март:Апрель:Май:Июнь:Июль:Август:Сентябрь:Октябрь:Ноябрь:Декабрь
21 </string>
22 <button label="" label_selected="" name="scriptout" 16 <button label="" label_selected="" name="scriptout"
23 tool_tip="Предупреждения и ошибки скриптов" /> 17 tool_tip="Предупреждения и ошибки скриптов" />
24 <button label="" label_selected="" name="health" tool_tip="Здоровье" /> 18 <button label="" label_selected="" name="health" tool_tip="Здоровье" />
diff --git a/linden/indra/newview/skins/default/xui/ru/strings.xml b/linden/indra/newview/skins/default/xui/ru/strings.xml
index 086adee..8d74f34 100644
--- a/linden/indra/newview/skins/default/xui/ru/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ru/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Воскр.:Понед.:Вторник:Среда:Четверг:Пятница:Суббота
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Январь:Февраль:Март:Апрель:Май:Июнь:Июль:Август:Сентябрь:Октябрь:Ноябрь:Декабрь
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Входим. [APP_NAME] может казаться зависшим. Пожалуйста подождите. 17 Входим. [APP_NAME] может казаться зависшим. Пожалуйста подождите.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/tr/panel_status_bar.xml
index 16a58cc..60910e8 100644
--- a/linden/indra/newview/skins/default/xui/tr/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/tr/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text length="12" name="TimeText" tool_tip="Mevcut zaman (Pasifik)" type="string"> 10 <text length="12" name="TimeText" tool_tip="Mevcut zaman (Pasifik)" type="string">
11 12:00 AM 11 12:00 AM
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek">
14 Pazar:Pazartesi:Salı:Çarşamba:Perşembe:Cuma:Cumartesi
15 </string>
16 <string name="StatBarMonthsOfYear">
17 Ocak:Şubat:Mart:Nisan:Mayıs:Haziran:Temmuz:Ağustos:Eylül:Ekim:Kasım:Aralık
18 </string>
19 <button label="" label_selected="" name="scriptout" tool_tip="Betik uyarıları ve hataları"/> 13 <button label="" label_selected="" name="scriptout" tool_tip="Betik uyarıları ve hataları"/>
20 <button label="" label_selected="" name="health" tool_tip="Sağlık"/> 14 <button label="" label_selected="" name="health" tool_tip="Sağlık"/>
21 <text length="1" name="HealthText" tool_tip="Health" type="string"> 15 <text length="1" name="HealthText" tool_tip="Health" type="string">
diff --git a/linden/indra/newview/skins/default/xui/tr/strings.xml b/linden/indra/newview/skins/default/xui/tr/strings.xml
index 167367f..f3a5c6a 100644
--- a/linden/indra/newview/skins/default/xui/tr/strings.xml
+++ b/linden/indra/newview/skins/default/xui/tr/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Pazar:Pazartesi:Salı:Çarşamba:Perşembe:Cuma:Cumartesi
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Ocak:Şubat:Mart:Nisan:Mayıs:Haziran:Temmuz:Ağustos:Eylül:Ekim:Kasım:Aralık
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Giriş yapılıyor.[APP_NAME] donmuş gözükebilir.Lütfen bekleyiniz. 17 Giriş yapılıyor.[APP_NAME] donmuş gözükebilir.Lütfen bekleyiniz.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/uk/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/uk/panel_status_bar.xml
index c73db8d..b062539 100644
--- a/linden/indra/newview/skins/default/xui/uk/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/uk/panel_status_bar.xml
@@ -12,12 +12,6 @@
12 <text type="string" length="12" name="TimeText" tool_tip="Час (тихоокеанський)"> 12 <text type="string" length="12" name="TimeText" tool_tip="Час (тихоокеанський)">
13 12:00 AM 13 12:00 AM
14 </text> 14 </text>
15 <string name="StatBarDaysOfWeek">
16 Неділя:Понед.:Вівторок:Середа:Четвер:П&apos;ятниця:Субота
17 </string>
18 <string name="StatBarMonthsOfYear">
19 Січень:Лютий:Березень:Квітень:Травень:Червень:Липень:Серпень:Вересень:Жовтень:Листопад:Грудень
20 </string>
21 <button label="" label_selected="" name="scriptout" 15 <button label="" label_selected="" name="scriptout"
22 tool_tip="Попередження і помилки скриптів" /> 16 tool_tip="Попередження і помилки скриптів" />
23 <button label="" label_selected="" name="health" tool_tip="Здоров&apos;я" /> 17 <button label="" label_selected="" name="health" tool_tip="Здоров&apos;я" />
diff --git a/linden/indra/newview/skins/default/xui/uk/strings.xml b/linden/indra/newview/skins/default/xui/uk/strings.xml
index 388e6f1..b737a08 100644
--- a/linden/indra/newview/skins/default/xui/uk/strings.xml
+++ b/linden/indra/newview/skins/default/xui/uk/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 Неділя:Понед.:Вівторок:Середа:Четвер:П&apos;ятниця:Субота
11 </string>
12 <string name="StatBarMonthsOfYear">
13 Січень:Лютий:Березень:Квітень:Травень:Червень:Липень:Серпень:Вересень:Жовтень:Листопад:Грудень
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 Входимо. [APP_NAME] може здаватися завислим. Будь ласка, зачекайте. 17 Входимо. [APP_NAME] може здаватися завислим. Будь ласка, зачекайте.
9 </string> 18 </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 9232ad0..0f65852 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -10,12 +10,6 @@
10 <text name="TimeText" tool_tip="当前时间（太平洋时区）"> 10 <text name="TimeText" tool_tip="当前时间（太平洋时区）">
11 12:00 AM 11 12:00 AM
12 </text> 12 </text>
13 <string name="StatBarDaysOfWeek">
14 星期日:星期一:星期二:星期三:星期四:星期五:星期六
15 </string>
16 <string name="StatBarMonthsOfYear">
17 一月:二月:三月:四月:五月:六月:七月:八月:九月:十月:十一月:十二月
18 </string>
19 <button label="" label_selected="" name="scriptout" tool_tip="脚本警告及错误。"/> 13 <button label="" label_selected="" name="scriptout" tool_tip="脚本警告及错误。"/>
20 <button label="" label_selected="" name="health" tool_tip="健康"/> 14 <button label="" label_selected="" name="health" tool_tip="健康"/>
21 <text name="HealthText" tool_tip="健康"> 15 <text name="HealthText" tool_tip="健康">
diff --git a/linden/indra/newview/skins/default/xui/zh/strings.xml b/linden/indra/newview/skins/default/xui/zh/strings.xml
index 8bdba65..c6b3c5a 100644
--- a/linden/indra/newview/skins/default/xui/zh/strings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings.xml
@@ -4,6 +4,15 @@
4 For example, the strings used in avatar chat bubbles, and strings 4 For example, the strings used in avatar chat bubbles, and strings
5 that are returned from one component and may appear in many places--> 5 that are returned from one component and may appear in many places-->
6<strings> 6<strings>
7
8 <!-- Imprudence-specific strings -->
9 <string name="StatBarDaysOfWeek">
10 星期日:星期一:星期二:星期三:星期四:星期五:星期六
11 </string>
12 <string name="StatBarMonthsOfYear">
13 一月:二月:三月:四月:五月:六月:七月:八月:九月:十月:十一月:十二月
14 </string>
15
7 <string name="LoginInProgress"> 16 <string name="LoginInProgress">
8 正在登录。 [APP_NAME] 可能会看上去没有反应。 请稍候。 17 正在登录。 [APP_NAME] 可能会看上去没有反应。 请稍候。
9 </string> 18 </string>
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp
new file mode 100644
index 0000000..57348f0
--- /dev/null
+++ b/linden/indra/newview/viewertime.cpp
@@ -0,0 +1,260 @@
1/**
2* @file viewertime.cpp
3* @brief sets the viewer time and time format
4*
5* $LicenseInfo:firstyear=2009&license=viewergpl$
6*
7* Copyright (c) 2010, McCabe Maxsted
8*
9* Imprudence Viewer Source Code
10* The source code in this file ("Source Code") is provided to you
11* under the terms of the GNU General Public License, version 2.0
12* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
13* this distribution, or online at
14* http://secondlifegrid.net/programs/open_source/licensing/gplv2
15*
16* There are special exceptions to the terms and conditions of the GPL as
17* it is applied to this Source Code. View the full text of the exception
18* in the file doc/FLOSS-exception.txt in this software distribution, or
19* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
20*
21* By copying, modifying or distributing this software, you acknowledge
22* that you have read and understood your obligations described above,
23* and agree to abide by those obligations.
24*
25* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
26* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27* COMPLETENESS OR PERFORMANCE.
28* $/LicenseInfo$
29*/
30
31#include "llviewerprecompiledheaders.h"
32
33#include "llappviewer.h" // for gPacificDaylightTime
34#include "lltrans.h"
35#include "viewertime.h"
36
37// system includes
38#include <iomanip>
39
40// WIP -- MC
41// TODO: localize time
42// TODO: accept time_t and return the appropriate format for timestamps
43// TODO: support multiple date formats
44
45ViewerTime* gViewerTime = 0;
46bool ViewerTime::sUse24HourTime = false;
47bool ViewerTime::sUseUTCTime = false;
48
49std::vector<std::string> ViewerTime::sDays;
50std::vector<std::string> ViewerTime::sMonths;
51const U32 ViewerTime::MAX_DATE_STRING_LENGTH = 2000;
52
53ViewerTime::ViewerTime() :
54 mHour(0),
55 mMinute(0),
56 mSecond(0),
57 mTZ(LLStringUtil::null),
58 mTimeStr(LLStringUtil::null),
59 mAMPM(" AM"),
60 mDay(LLStringUtil::null),
61 mDayNum(1),
62 mMonth(LLStringUtil::null),
63 mYear(1900),
64 mDateStr(LLStringUtil::null)
65{
66 // size of day of the weeks and year
67 sDays.reserve(7);
68 sMonths.reserve(12);
69
70 setupDate();
71 refresh();
72}
73
74ViewerTime::~ViewerTime()
75{
76}
77
78void ViewerTime::refresh()
79{
80 // Get current UTC time, adjusted for the user's clock
81 // being off.
82 time_t utc_time;
83 utc_time = time_corrected();
84
85 // There's only one internal tm buffer.
86 struct tm* internal_time;
87
88 if (!sUseUTCTime)
89 {
90 // Convert to Pacific, based on server's opinion of whether
91 // it's daylight savings time there.
92 internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
93 }
94 else
95 {
96 time(&utc_time);
97 internal_time = gmtime(&utc_time);
98 }
99
100 mMinute = internal_time->tm_min;
101 mSecond = internal_time->tm_sec;
102 S32 hour = internal_time->tm_hour;
103
104 mAMPM = "";
105 char leading = '0';
106
107 if (!sUseUTCTime)
108 {
109 if (!sUse24HourTime)
110 {
111 leading = ' ';
112 mAMPM = " AM";
113 if (hour > 11)
114 {
115 hour -= 12;
116 mAMPM = " PM";
117 }
118 // Zero hour is 12 AM
119 if (hour == 0) hour = 12;
120 }
121
122 mTZ = "PST";
123 if (gPacificDaylightTime)
124 {
125 mTZ = "PDT";
126 }
127 }
128 else // just UTC
129 {
130 mTZ = "UTC";
131 }
132 mHour = hour;
133
134 std::ostringstream t;
135 t << std::setfill(leading) << std::setw(2) << mHour << ":"
136 << std::setfill('0') << std::setw(2) << mMinute
137 << mAMPM << " " << mTZ;
138 mTimeStr = t.str();
139
140 // Year starts at 1900
141 mDay = sDays[internal_time->tm_wday];
142 mDayNum = internal_time->tm_mday;
143 mMonth = sMonths[internal_time->tm_mon];
144 mYear = internal_time->tm_year + 1900;
145
146 std::ostringstream date;
147 date << mDay << ", "
148 << std::setfill('0') << std::setw(2) << mDayNum << " "
149 << mMonth << " "
150 << mYear;
151
152 mDateStr = date.str();
153}
154
155// sets the static variables necessary for the date
156void ViewerTime::setupDate()
157{
158 // fill the day array with what's in the xui
159 std::string day_list = LLTrans::getString("StatBarDaysOfWeek");
160 size_t length = day_list.size();
161
162 // quick input check
163 if(length < MAX_DATE_STRING_LENGTH)
164 {
165 // tokenize it and put it in the array
166 std::string cur_word;
167 for(size_t i = 0; i < length; ++i)
168 {
169 if(day_list[i] == ':')
170 {
171 sDays.push_back(cur_word);
172 cur_word.clear();
173 }
174 else
175 {
176 cur_word.append(1, day_list[i]);
177 }
178 }
179 sDays.push_back(cur_word);
180 }
181
182 // fill the day array with what's in the xui
183 std::string month_list = LLTrans::getString("StatBarMonthsOfYear");
184 length = month_list.size();
185
186 // quick input check
187 if(length < MAX_DATE_STRING_LENGTH)
188 {
189 // tokenize it and put it in the array
190 std::string cur_word;
191 for(size_t i = 0; i < length; ++i)
192 {
193 if(month_list[i] == ':')
194 {
195 sMonths.push_back(cur_word);
196 cur_word.clear();
197 }
198 else
199 {
200 cur_word.append(1, month_list[i]);
201 }
202 }
203 sMonths.push_back(cur_word);
204 }
205
206 // make sure we have at least 7 days and 12 months
207 if(sDays.size() < 7)
208 {
209 sDays.resize(7);
210 }
211
212 if(sMonths.size() < 12)
213 {
214 sMonths.resize(12);
215 }
216}
217
218std::string ViewerTime::getDayOfWeek(const U32& day_num)
219{
220 if (day_num < 7 && !sDays.empty())
221 {
222 return sDays[day_num];
223 }
224 return LLStringUtil::null;
225}
226
227std::string ViewerTime::getMonth(const U32& month_num)
228{
229 if (month_num < 12 && !sMonths.empty())
230 {
231 return sMonths[month_num];
232 }
233 return LLStringUtil::null;
234}
235
236void ViewerTime::updateTimeFormat(const U32& index)
237{
238 /*
239 Time Format:
240 0 - sim 12 hour time
241 1 - sim 24 hour time
242 2 - UTC time
243 */
244 switch (index)
245 {
246 case 2:
247 sUse24HourTime = false;
248 sUseUTCTime = true;
249 break;
250 case 1:
251 sUse24HourTime = true;
252 sUseUTCTime = false;
253 break;
254 case 0:
255 default:
256 sUse24HourTime = false;
257 sUseUTCTime = false;
258 break;
259 }
260}
diff --git a/linden/indra/newview/viewertime.h b/linden/indra/newview/viewertime.h
new file mode 100644
index 0000000..525a2bc
--- /dev/null
+++ b/linden/indra/newview/viewertime.h
@@ -0,0 +1,88 @@
1/**
2* @file viewertime.h
3* @brief sets the viewer time and time format
4*
5* $LicenseInfo:firstyear=2009&license=viewergpl$
6*
7* Copyright (c) 2010, McCabe Maxsted
8*
9* Imprudence Viewer Source Code
10* The source code in this file ("Source Code") is provided to you
11* under the terms of the GNU General Public License, version 2.0
12* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
13* this distribution, or online at
14* http://secondlifegrid.net/programs/open_source/licensing/gplv2
15*
16* There are special exceptions to the terms and conditions of the GPL as
17* it is applied to this Source Code. View the full text of the exception
18* in the file doc/FLOSS-exception.txt in this software distribution, or
19* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
20*
21* By copying, modifying or distributing this software, you acknowledge
22* that you have read and understood your obligations described above,
23* and agree to abide by those obligations.
24*
25* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
26* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27* COMPLETENESS OR PERFORMANCE.
28* $/LicenseInfo$
29*/
30
31#ifndef VIEWERTIME_H
32#define VIEWERTIME_H
33
34
35class ViewerTime
36{
37public:
38 ViewerTime();
39 ~ViewerTime();
40
41 // Per-frame refresh of the time and date (called in LLStatusBar)
42 void refresh();
43
44 std::string getDayOfWeek(const U32& day_num);
45 std::string getMonth(const U32& month_num);
46
47 std::string getCurDay() { return mDay; }
48 std::string getCurMonth() { return mMonth; }
49 S32 getCurDayNum() { return mDayNum; }
50
51 S32 getCurHour() { return mHour; }
52 S32 getCurMin() { return mMinute; }
53 S32 getCurSec() { return mSecond; }
54
55 std::string getCurAMPM() { return mAMPM; }
56 std::string getCurTZ() { return mTZ; }
57 std::string getCurTimeStr() { return mTimeStr; }
58 std::string getCurDateStr() { return mDateStr; }
59
60 static bool sUse24HourTime;
61 static bool sUseUTCTime;
62
63 void updateTimeFormat(const U32& index);
64
65private:
66 // simple method to setup the part that holds the date
67 void setupDate();
68
69 S32 mHour;
70 S32 mMinute;
71 S32 mSecond;
72 std::string mTZ;
73 std::string mAMPM;
74 std::string mTimeStr;
75 std::string mDay;
76 S32 mDayNum;
77 std::string mMonth;
78 S32 mYear;
79 std::string mDateStr;
80
81 static std::vector<std::string> sDays;
82 static std::vector<std::string> sMonths;
83 static const U32 MAX_DATE_STRING_LENGTH;
84};
85
86extern ViewerTime* gViewerTime;
87
88#endif // VIEWERTIME_H
generated by cgit v1.1 at 2024-06-02 13:44:37 +0000