diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/pl/floater_report_abuse.xml | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_report_abuse.xml')
| -rwxr-xr-x | indra/newview/skins/default/xui/pl/floater_report_abuse.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml index 31959bd438..5da5ce0dc0 100755 --- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml @@ -46,9 +46,9 @@ <combo_item name="Age__Adult_resident_on_Teen_Second_Life"> Wiek > Dorosły Rezydent w Teen Second Life </combo_item> - <combo_item name="Age__Underage_resident_on_Adult_Second_Life"> - Wiek > Nieletni Rezydent w Second Life dla Dorosłych - </combo_item> + + + <combo_item name="Assault__Combat_sandbox___unsafe_area"> Napaść > Strefa Militarna / Niebezpieczny Obszar </combo_item> @@ -118,15 +118,15 @@ <combo_item name="Indecency__Broadly_offensive_content_or_conduct"> Nieprzyzwoitość > Obraźliwa Treść lub Postępowanie </combo_item> - <combo_item name="Indecency__Broadly_visible_mature_content"> - Nieprzyzwoitość > Widoczna Treść dla Dorosłych - </combo_item> + + + <combo_item name="Indecency__Inappropriate_avatar_name"> Nieprzyzwoitość > Niestosowne Imię Awatara </combo_item> - <combo_item name="Indecency__Mature_content_in_PG_region"> - Nieprzyzwoitość > Treść dla Dorosłych (18+) w Regionie dla Wszystkich (BO) - </combo_item> + + + <combo_item name="Intellectual_property_infringement_Content_Removal"> Naruszenie Własności Intelektualnej > Usunięcie Treści </combo_item> |