livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Firestorm LGPL

master
Ansariel 2019-10-09 22:09:22 +02:00
parent 146d527104 22c24e188a
commit e0004e744e
45 changed files with 83 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -39,6 +39,7 @@ ab632018105ccfdf8a9e5ea1a8302badd58b686e Firestorm_5.0.1_Release
8888a131acad19c49fcff1ad2cf75c54c8a41bb8 Firestorm_6.0.1_Beta
ba5e1592f3a79317a3ebac441ee5946a81b97fab Firestorm_6.0.2_Release
7b5a98fba31fa019bddb3ae900c6dd94604bc8be Firestorm_6.2.4_Release
381d04b870a59ef98cc442a5d4aeb6b38cfdbed7 Firestorm_6.3.2_Release
bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2.1.1-release
003dd9461bfa479049afcc34545ab3431b147c7c v2start
52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3

2
indra/llwindow/llwindowmacosx.cpp
View File

@ -77,7 +77,7 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
"\n"
"If you own a supported card and continue to receive this message, try \n"
"updating to the latest video card drivers. Otherwise contact the\n"
"Phoenix Viewer Support group in world, or visit www.phoenixviewer.com\n"
"Phoenix Viewer Support group in world, or visit www.firestormviewer.org\n"
"for support.\n"
"\n"
"You can try to run Firestorm, but it will probably crash or run\n"

5
indra/newview/app_settings/settings.xml
View File

@ -6744,7 +6744,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://wiki.phoenixviewer.com/[TOPIC]</string>
<string>https://wiki.firestormviewer.org/[TOPIC]</string>
<key>Backup</key>
<integer>0</integer>
</map>
@ -6757,7 +6757,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://www.phoenixviewer.com/viewerfloater/howtofloater/index.html</string>
<string>https://wiki.firestormviewer.org/start#basic_functions</string>
<key>Backup</key>
<integer>0</integer>
</map>
@ -18645,7 +18645,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<string>script_floater</string>
<string>world_map</string>
<string>preferences</string>
<string>facebook</string>
<string>flickr</string>
<string>twitter</string>
</array>

10
indra/newview/linux_tools/client-readme.txt
View File

@ -126,7 +126,7 @@ SOLUTION:- Usually this indicates that your graphics card does not meet
<https://help.ubuntu.com/community/BinaryDriverHowto>
* If your distribution does not make it easy, then you can download the
required Linux drivers straight from your graphics card manufacturer:
- <http://wiki.phoenixviewer.com/phoenix_downloads#video_drivers>
- <https://wiki.firestormviewer.org/downloads#video_drivers>
PROBLEM 2:- My whole system seems to hang when running Firestorm.
SOLUTION:- This is typically a hardware/driver issue. The first thing to
@ -201,19 +201,19 @@ configuration options for advanced troubleshooters.
We're pleased to have released Firestorm client's source code under
an Open Source license compatible with the 'LGPL'.
<http://wiki.phoenixviewer.com/phoenix_downloads#source_code>
<https://wiki.firestormviewer.org/downloads#source_code>
8. GETTING MORE HELP AND REPORTING PROBLEMS
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
For general help and support with Firestorm:
<http://wiki.phoenixviewer.com>
<http://wiki.firestormviewer.org>
In-world discussion:
Main support: Join one of our in-world support groups.
<http://wiki.phoenixviewer.com/firestorm_in-world_groups>
<http://wiki.firestormviewer.org/firestorm_in-world_groups>
There is also a 'Linux Client Users' group inside Second Life which
is free to join. You can find it by pressing the 'Search' button at
@ -222,7 +222,7 @@ searching for 'Linux'. This group is useful for discussing Linux
issues with fellow Linux client users who are online.
The Firestorm Issue Tracker:
<http://jira.phoenixviewer.com/>
<https://jira.firestormviewer.org/>
This is the right place for finding known issues and reporting new
bugs in all Firestorm releases if you find that the Troubleshooting
section in this file hasn't helped.

2
indra/newview/linux_tools/wrapper.sh
View File

@ -183,7 +183,7 @@ most common problems when launching the Viewer (particularly
loading shared libraries') may be solved by enabling 32-bit
architecture and installing one or more 32-bit compatibility libraries.
Consult the Firestorm wiki at
http://wiki.phoenixviewer.com/32-bit_viewer_in_64-bit_linux
http://wiki.firestormviewer.org/32-bit_viewer_in_64-bit_linux
EOFMARKER
fi
fi

2
indra/newview/llappviewer.cpp
View File

@ -3743,7 +3743,7 @@ LLSD LLAppViewer::getViewerInfo() const
// https://releasenotes.secondlife.com/viewer/2.1.0.123456.html
std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
// <FS:Ansariel> FIRE-13993: Leave out channel so we can use a URL like
// http://wiki.phoenixviewer.com/firestorm_change_log_x.y.z.rev
// http://wiki.firestormviewer.org/firestorm_change_log_x.y.z.rev
//if (! LLStringUtil::endsWith(url, "/"))
// url += "/";
//url += LLURI::escape(LLVersionInfo::getVersion()) + ".html";

2
indra/newview/llpanelobject.cpp
View File

@ -1546,7 +1546,7 @@ void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
childSetVisible("ObjectLODbehaviourLabel", true);
// Setup the LL defaults
factor = 1.125f; // LL default for most people http://wiki.phoenixviewer.com/support:whirly_fizzle#lod_comparison
factor = 1.125f; // LL default for most people http://wiki.firestormviewer.org/support:whirly_fizzle#lod_comparison
args["FACTOR"] = llformat("%.3f", factor);
tb = getChild<LLTextBox>("LOD_swap_ll_default");
tb->setToolTip(getString("ll_lod_tooltip_msg",args));

6
indra/newview/lltoolpie.cpp
View File

@ -143,6 +143,12 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
// !transparent_object check will be covered by transparent_object == visible_object.
mPick = transparent_pick;
}
// <FS:ND> FIRE-29031; Handle transparent being nullptr (due to RLVa?). visible_object cannot be invalid here or the if above had been entered
else if( !transp_object)
{
mPick = visible_pick;
}
// </FS:ND>
else
{
// Select between two non-null picks

3
indra/newview/llvoavatar.cpp
View File

@ -3085,10 +3085,9 @@ void LLVOAvatar::idleUpdateLoadingEffect()
// <FS:Zi> Animation Overrider
AOEngine::instance().onLoginComplete();
#ifdef HAS_DISCORD
// <FS:LO> tapping a place that happens on landing in world to start up discord
FSDiscordConnect::instance().checkConnectionToDiscord(gSavedPerAccountSettings.getBOOL("FSEnableDiscordIntegration"));
#endif
}
else
{

6
indra/newview/rlvcommon.cpp
View File

@ -346,6 +346,12 @@ void RlvStrings::saveToFile(const std::string& strFilePath)
// Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
const std::string& RlvStrings::getAnonym(const std::string& strName)
{
if (!rlv_handler_t::isEnabled())
{
static std::string strNobody = LLTrans::getString("AvatarNameNobody");
return strNobody;
}
const char* pszName = strName.c_str(); U32 nHash = 0;
// Test with 11,264 SL names showed a 3.33% - 3.82% occurance for each so we *should* get a very even spread

4
indra/newview/skins/default/xui/da/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Netværk" name="tab-conn">
<text name="Maximum bandwidth">
Maksimum båndbredde ([http://wiki.phoenixviewer.com/fs_speedtest need a suggestion?]):
Maksimum båndbredde ([http://wiki.firestormviewer.org/fs_speedtest need a suggestion?]):
</text>
<check_box label="Speciel port" name="connection_port_enabled"/>
<spinner label="Port nummer:" name="connection_port"/>
@ -14,7 +14,7 @@
</panel>
<panel label="Placering" name="tab-dir">
<text name="cache_size_label_l">
Cache størrelse ([http://wiki.phoenixviewer.com/cache need a suggestion?]):
Cache størrelse ([http://wiki.firestormviewer.org/cache need a suggestion?]):
</text>
<text name="Cache location">
Cache placering:

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

@ -26,7 +26,7 @@
Das Medien-Browser-Plugin lädt gerade.
Sollte das Plugin nicht laden, sind Informationen zur Problemlösung erhältlich unter
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
</text>
<button label="In meinem Browser öffnen" name="open_browser"/>
<check_box label="Immer in meinem Browser öffnen" name="open_always"/>

4
indra/newview/skins/default/xui/de/floater_web_content.xml
View File

@ -18,11 +18,11 @@
Das Web-Browser-Plugin lädt gerade.
Sollte das Plugin nicht laden, sind Informationen zur Problemlösung erhältlich unter
http://wiki.phoenixviewer.com/fs_search_issues
http://wiki.firestormviewer.org/fs_search_issues
und
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
</text>
</layout_panel>
</layout_stack>

4
indra/newview/skins/default/xui/de/notifications.xml
View File

@ -3634,7 +3634,7 @@ Bitte prüfen Sie Ihre Netzwerk- und Firewall-Konfiguration.
Deaktivieren Sie alle SIP ALG-Funktionen in Ihrem Router.
Voice-Kommunikation ist leider nicht verfügbar.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<usetemplate name="okignore" yestext="OK" ignoretext="Warnen, wenn keine Verbindung zum Voice-Server hergestellt werden kann."/>
</notification>
<notification name="NoVoiceConnect-GIAB">
@ -3642,7 +3642,7 @@ Voice-Kommunikation ist leider nicht verfügbar.
Voice-Kommunikation ist leider nicht verfügbar.
Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<usetemplate name="okignore" yestext="OK"/>
</notification>
<notification name="AvatarRezLeftNotification">

4
indra/newview/skins/default/xui/de/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Verbindung" name="tab-conn">
<text name="Maximum bandwidth">
Maximale Bandbreite ([http://wiki.phoenixviewer.com/fs_speedtest Empfehlungen anzeigen?]):
Maximale Bandbreite ([http://wiki.firestormviewer.org/fs_speedtest Empfehlungen anzeigen?]):
</text>
<text name="NetworkPrefText1">
Funk
@ -47,7 +47,7 @@
</panel>
<panel label="Verzeichnisse" name="tab-dir">
<text name="cache_size_label_l">
Cache-Größe ([http://wiki.phoenixviewer.com/cache Empfehlungen anzeigen?]):
Cache-Größe ([http://wiki.firestormviewer.org/cache Empfehlungen anzeigen?]):
</text>
<button label="Inventar-Cache löschen" width="137" name="ClearInventoryCache"/>
<text name="Cache location">

2
indra/newview/skins/default/xui/en/floater_media_browser.xml
View File

@ -202,7 +202,7 @@
The web browser plugin seems to be taking a while to open.
If the plugin never loads, please visit:
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
for possible steps to resolve this issue.
</text>

4
indra/newview/skins/default/xui/en/floater_web_content.xml
View File

@ -202,11 +202,11 @@
The web browser plugin seems to be taking a while to open.
If the plugin never loads, please visit:
http://wiki.phoenixviewer.com/fs_search_issues
http://wiki.firestormviewer.org/fs_search_issues
and
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
for possible steps to resolve this issue.
</text>

4
indra/newview/skins/default/xui/en/menu_login.xml
View File

@ -63,7 +63,7 @@
<menu_item_call.on_click
function="PromptShowURL"
name="script_library_url"
parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/doku.php?id=start" />
parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/doku.php?id=start" />
</menu_item_call>
<menu_item_call
label="Troubleshooting"
@ -71,7 +71,7 @@
<menu_item_call.on_click
function="PromptShowURL"
name="wiki_troubleshooting_url"
parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_troubleshooting" />
parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_troubleshooting" />
</menu_item_call>
<!--
<menu_item_separator />

8
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -2072,7 +2072,7 @@
<menu_item_call.on_click
function="PromptShowURL"
name="script_library_url"
parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com" />
parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org" />
</menu_item_call>
<menu_item_call
@ -2081,7 +2081,7 @@
<menu_item_call.on_click
function="PromptShowURL"
name="wiki_troubleshooting_url"
parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_troubleshooting" />
parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_troubleshooting" />
</menu_item_call>
<menu_item_call
@ -2089,7 +2089,7 @@
name="firestorm_support_group">
<menu_item_call.on_click
function="Advanced.WebBrowserTest"
parameter="http://wiki.phoenixviewer.com/firestorm_support_groups_join" />
parameter="http://wiki.firestormviewer.org/firestorm_support_groups_join" />
<menu_item_call.on_visible
function="GridCheck"
parameter="secondlife" />
@ -2101,7 +2101,7 @@
<menu_item_call.on_click
function="PromptShowURL"
name="wiki_classes_url"
parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_classes" />
parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_classes" />
</menu_item_call>
<menu_item_call

4
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -9390,7 +9390,7 @@ Please check your network and firewall setup.
Disable any SIP ALG feature in your router.
Voice communications will not be available.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<tag>voice</tag>
<tag>fail</tag>
<usetemplate
@ -9407,7 +9407,7 @@ We're having trouble connecting to your voice server.
Voice communications will not be available.
Please check your network and firewall setup.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<tag>voice</tag>
<tag>fail</tag>
<usetemplate

4
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
View File

@ -43,7 +43,7 @@
mouse_opaque="false"
top_pad="15"
width="500">
Maximum bandwidth ([http://wiki.phoenixviewer.com/fs_speedtest need a suggestion?]):
Maximum bandwidth ([http://wiki.firestormviewer.org/fs_speedtest need a suggestion?]):
</text>
<icon
@ -411,7 +411,7 @@
name="cache_size_label_l"
top_pad="15"
width="500">
Cache size ([http://wiki.phoenixviewer.com/cache need a suggestion?]):
Cache size ([http://wiki.firestormviewer.org/cache need a suggestion?]):
</text>
<slider
can_edit_text="true"

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

@ -376,7 +376,7 @@ Please try logging in again in a minute.</string>
<string name="ReleaseNotes">Release Notes</string>
<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
<string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.phoenixviewer.com/firestorm_change_log_</string>
<string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.firestormviewer.org/firestorm_change_log_</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string>

2
indra/newview/skins/default/xui/es/floater_media_browser.xml
View File

@ -26,7 +26,7 @@
<text name="plugin_fail_text">
El conector del navegador web parece estar tardando en abrirse. Si no se termina de abrir, por favor visita:
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
para ver posibles formas de resolver este problema.
</text>

4
indra/newview/skins/default/xui/es/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Conexión" name="tab-conn">
<text name="Maximum bandwidth">
Ancho de banda máximo ([http://wiki.phoenixviewer.com/fs_speedtest qué necesita una sugerencia?]):
Ancho de banda máximo ([http://wiki.firestormviewer.org/fs_speedtest qué necesita una sugerencia?]):
</text>
<check_box label="Personalizar el puerto" name="connection_port_enabled"/>
<spinner label="Nº del puerto:" name="connection_port" width="160" label_width="85"/>
@ -27,7 +27,7 @@
</panel>
<panel label="Directorio" name="tab-dir">
<text name="cache_size_label_l">
Tamaño de la caché ([http://wiki.phoenixviewer.com/cache necesita una sugerencia?]):
Tamaño de la caché ([http://wiki.firestormviewer.org/cache necesita una sugerencia?]):
</text>
<text name="Cache location">
Directorio de la caché:

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

@ -19,7 +19,7 @@
<text name="plugin_fail_text">
Le plugin du navigateur web semble mettre du temps à s'ouvrir.
Si le plugin ne se charge pas, veuillez visiter :
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
pour plus d'informations concernant ce problème.
</text>
<button label="Ouvrir dans mon navigateur web" name="open_browser"/>

4
indra/newview/skins/default/xui/fr/floater_web_content.xml
View File

@ -15,9 +15,9 @@
Le plugin du navigateur semble mettre du temps à répondre
Si le plugin ne se charge pas, veuillez consulter :
http://wiki.phoenixviewer.com/fs_search_issues
http://wiki.firestormviewer.org/fs_search_issues
et/ou http://wiki.phoenixviewer.com/fs_media
et/ou http://wiki.firestormviewer.org/fs_media
pour plus d'informations concernant ce problème.
</text>

4
indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
View File

@ -2,7 +2,7 @@
<panel label="Initialisation" name="Input panel">
<tab_container name="max_bandwidth_layout" label="Initialisation">
<panel label="Connexion" name="tab-conn">
<text name="Maximum bandwidth">Bande passante maximale ([http://wiki.phoenixviewer.com/fs_speedtest Besoin d'aide ?]):</text>
<text name="Maximum bandwidth">Bande passante maximale ([http://wiki.firestormviewer.org/fs_speedtest Besoin d'aide ?]):</text>
<text name="text_box2">Kbps</text>
<text name="NetworkPrefText1">Wi-Fi</text>
<text name="NetworkPrefText2">DSL</text>
@ -31,7 +31,7 @@
<button label="Configurer les paramètres proxy" label_selected="Configurer les paramètres proxy" name="set_proxy"/>
</panel>
<panel label="Dossiers" name="tab-dir">
<text name="cache_size_label_l">Taille du cache ([http://wiki.phoenixviewer.com/cache Besoin d'aide ?]) :</text>
<text name="cache_size_label_l">Taille du cache ([http://wiki.firestormviewer.org/cache Besoin d'aide ?]) :</text>
<text name="text_box5">Mo</text>
<button label="Vider le cache de l'inventaire" name="ClearInventoryCache" left="350" width="180"/>
<text name="Cache location">Emplacement du cache :</text>

2
indra/newview/skins/default/xui/it/floater_media_browser.xml
View File

@ -20,7 +20,7 @@
Il plugin per il contenuto web sta impiegando molto tempo ad aprirsi.
Se non si carica, visitare:
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
per cercare di risolvere il problema.
</text>

4
indra/newview/skins/default/xui/it/floater_web_content.xml
View File

@ -18,11 +18,11 @@
Il plugin per il contenuto web sta impiegando molto tempo ad aprirsi.
Se non si carica, visitare:
http://wiki.phoenixviewer.com/fs_search_issues
http://wiki.firestormviewer.org/fs_search_issues
e
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
per cercare di risolvere il problema.
</text>

4
indra/newview/skins/default/xui/it/notifications.xml
View File

@ -3487,7 +3487,7 @@ Consigliamo di controllare le impostazioni di rete e del firewall.
Disabilitare tutte le funzioni SIP ALG sul router.
Le comunicazioni tramite voce non saranno disponibili.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<usetemplate ignoretext="Avvisami quando non è possibile la connessione con il server voce" name="okignore"/>
</notification>
<notification name="NoVoiceConnect-GIAB">
@ -3495,7 +3495,7 @@ Le comunicazioni tramite voce non saranno disponibili.
Le comunicazioni tramite voce non saranno disponibili.
Consigliamo di controllare le impostazioni di rete e del firewall.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
</notification>
<notification name="AvatarRezLeftNotification">
( presente da [EXISTENCE] secondi )

4
indra/newview/skins/default/xui/it/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Rete" name="tab-conn">
<text name="Maximum bandwidth">
Capacità massima di banda ([http://wiki.phoenixviewer.com/fs_speedtest serve un consiglio?]):
Capacità massima di banda ([http://wiki.firestormviewer.org/fs_speedtest serve un consiglio?]):
</text>
<text name="NetworkPrefText1" >
Wi-Fi
@ -45,7 +45,7 @@
</panel>
<panel label="Cartelle" name="tab-dir">
<text name="cache_size_label_l">
Dimensioni cache ([http://wiki.phoenixviewer.com/cache serve un consiglio?]):
Dimensioni cache ([http://wiki.firestormviewer.org/cache serve un consiglio?]):
</text>
<button label="Cancella cache inventario" name="ClearInventoryCache" left="350" width="150"/>
<text name="Cache location">

4
indra/newview/skins/default/xui/ja/floater_web_content.xml
View File

@ -23,11 +23,11 @@
Webブラウザのプラグインが開くのに時間がかかっています。
プラグインが全く読み込まれないようであれば、次のページを参考にしてみて下さい。
http://wiki.phoenixviewer.com/fs_search_issues
http://wiki.firestormviewer.org/fs_search_issues
または
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
この問題を解決する有効な手順を探してみて下さい。
</text>

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

@ -337,7 +337,7 @@
<menu_item_check label="ヒントを有効にする" name="Enable Hints"/>
<menu_item_call label="Firestorm Wiki" name="Firestorm Wiki"/>
<menu_item_call label="問題の解決" name="Troubleshooting">
<menu_item_call.on_click name="wiki_troubleshooting_url" parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_troubleshooting" />
<menu_item_call.on_click name="wiki_troubleshooting_url" parameter="WebLaunchExternalTarget,http://wiki.firestormviewer.org/firestorm_troubleshooting" />
</menu_item_call>
<menu_item_call label="Firestormサポートグループに参加" name="firestorm_support_group"/>

4
indra/newview/skins/default/xui/ja/notifications.xml
View File

@ -3816,12 +3816,12 @@ UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000
お使いのルーターの SIP ALG 機能をすべて無効にしてください。
ボイスチャットによるコミュニケーションが利用できません。
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="NoVoiceConnect-GIAB">
ボイスサーバーに接続できません。ボイスチャットによるコミュニケーションが利用できません。お使いのネットワークやファイアウォールの設定を確認してください。
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="AvatarRezLeftNotification">

4
indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
View File

@ -8,7 +8,7 @@
<tab_container name="max_bandwidth_layout" label="セットアップ">
<panel label="接続" name="tab-conn">
<text name="Maximum bandwidth">
最大帯域幅 ([http://wiki.phoenixviewer.com/fs_speedtest 適正な値を設定するには？]):
最大帯域幅 ([http://wiki.firestormviewer.org/fs_speedtest 適正な値を設定するには？]):
</text>
<icon name="NetworkLowGraphicsDivet" />
<icon name="NetworkMidGraphicsDivet" />
@ -64,7 +64,7 @@
<panel label="ディレクトリ" name="tab-dir">
<text name="cache_size_label_l">
キャッシュサイズ ([http://wiki.phoenixviewer.com/cache 推奨設定を確認しますか？]):
キャッシュサイズ ([http://wiki.firestormviewer.org/cache 推奨設定を確認しますか？]):
</text>
<text name="text_box5">
MB

2
indra/newview/skins/default/xui/pl/floater_media_browser.xml
View File

@ -19,7 +19,7 @@
Wygląda na to, że wtyczka przeglądarki długo się otwiera.
Jeśli plugin się wcale nie załaduje, to odwiedź:
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
aby poznać możliwe kroki naprawy błędu.
</text>

4
indra/newview/skins/default/xui/pl/floater_web_content.xml
View File

@ -18,11 +18,11 @@
Wygląda na to, że wtyczka przeglądarki długo się otwiera.
Jeśli plugin się wcale nie załaduje, to odwiedź:
http://wiki.phoenixviewer.com/fs_search_issues
http://wiki.firestormviewer.org/fs_search_issues
oraz
http://wiki.phoenixviewer.com/fs_media
http://wiki.firestormviewer.org/fs_media
aby poznać możliwe kroki naprawy błędu.
</text>

4
indra/newview/skins/default/xui/pl/notifications.xml
View File

@ -3468,7 +3468,7 @@ Porty, które muszą być otwarte dla połączeń głosowych, to:
Proszę sprawdź swoją sieć i ustawienia firewall.
Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim routerze.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
<usetemplate name="okignore" ignoretext="Ostrzegaj mnie, gdy przeglądarka nie może połączyć się z serwerem głosu" />
</notification>
<notification name="NoVoiceConnect-GIAB">
@ -3477,7 +3477,7 @@ Wyłącz wszelkie funkcjonalności SIP ALG (Application Layer Gateway) w swoim r
Komunikacja głosowa nie będzie dostępna.
Proszę sprawdź swoją sieć i ustawienia firewall.
[https://wiki.phoenixviewer.com/fs_voice]
[https://wiki.firestormviewer.org/fs_voice]
</notification>
<notification name="AvatarRezLeftNotification">
( [EXISTENCE] sekund w Second Life)

4
indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Połączenie" name="tab-conn">
<text name="Maximum bandwidth">
Maksymalna przepustowość ([http://wiki.phoenixviewer.com/fs_speedtest potrzebujesz sugestii?]):
Maksymalna przepustowość ([http://wiki.firestormviewer.org/fs_speedtest potrzebujesz sugestii?]):
</text>
<text name="NetworkPrefText3">
Światłowód
@ -41,7 +41,7 @@
</panel>
<panel label="Lokalizacje" name="tab-dir">
<text name="cache_size_label_l">
Rozmiar pamięci podręcznej ([http://wiki.phoenixviewer.com/cache potrzebujesz sugestii?]):
Rozmiar pamięci podręcznej ([http://wiki.firestormviewer.org/cache potrzebujesz sugestii?]):
</text>
<button label="Wyczyść bufor Szafy" name="ClearInventoryCache"/>
<text name="Cache location">

2
indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Rede" name="tab-conn">
<text name="Maximum bandwidth">
Largura de banda máxima ([http://wiki.phoenixviewer.com/fs_speedtest você precisa de uma sugestão?]):
Largura de banda máxima ([http://wiki.firestormviewer.org/fs_speedtest você precisa de uma sugestão?]):
</text>
<check_box label="Personalizar porta" name="connection_port_enabled"/>
<spinner label="Número da porta:" name="connection_port" width="160" label_width="85"/>

2
indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Подключение" name="tab-conn">
<text name="Maximum bandwidth">
Максимальная пропускная способность ([http://wiki.phoenixviewer.com/fs_speedtest Нужны подсказки?] (На английском)):
Максимальная пропускная способность ([http://wiki.firestormviewer.org/fs_speedtest Нужны подсказки?] (На английском)):
</text>
<text name="NetworkPrefText3">
Кабель

2
indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="Ağ" name="tab-conn">
<text name="Maximum bandwidth">
Maksimum bant genişliği ([http://wiki.phoenixviewer.com/fs_speedtest Bir öneri gerekiyor?]):
Maksimum bant genişliği ([http://wiki.firestormviewer.org/fs_speedtest Bir öneri gerekiyor?]):
</text>
<check_box label="Özel port" name="connection_port_enabled"/>
<spinner label="Port numarası:" name="connection_port" width="160" label_width="85"/>

2
indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
View File

@ -3,7 +3,7 @@
<tab_container name="max_bandwidth_layout">
<panel label="網路" name="tab-conn">
<text name="Maximum bandwidth">
最大頻寬 ([http://wiki.phoenixviewer.com/fs_speedtest 你需要一个建议?]):
最大頻寬 ([http://wiki.firestormviewer.org/fs_speedtest 你需要一个建议?]):
</text>
<check_box label="自訂埠" name="connection_port_enabled"/>
<spinner label="埠號:" name="connection_port"/>

1
indra/newview/skins/starlight/xui/pl/panel_group_info_sidetray.xml
View File

@ -27,6 +27,7 @@
<accordion_tab name="group_roles_tab" title="Funkcje i osoby"/>
<accordion_tab name="group_notices_tab" title="Ogłoszenia"/>
<accordion_tab name="group_land_tab" title="Działka/Majątek"/>
<accordion_tab name="group_experiences_tab" title="Przygody"/>
</accordion>
</layout_panel>
</layout_stack>

1
indra/newview/skins/starlightcui/xui/pl/panel_group_info_sidetray.xml
View File

@ -27,6 +27,7 @@
<accordion_tab name="group_roles_tab" title="Funkcje i osoby"/>
<accordion_tab name="group_notices_tab" title="Ogłoszenia"/>
<accordion_tab name="group_land_tab" title="Działka/Majątek"/>
<accordion_tab name="group_experiences_tab" title="Przygody"/>
</accordion>
</layout_panel>
</layout_stack>