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

Sync more stuff with upstream! (Mainly updates stuff involving LLFloaterGroupPicker)

Browse Source 
Updates llfloatergroups to be a lot similar to upstream
- Adds LLFLoaterGroupPicker::removeNoneOption and changes LLFloaterGroupPicker to use modern style callback
- Switched from using per ui xml string for the none entry in groups to the strings.xml one, updated and cleaned existing translations to use this.
- Changes LLFLoaterGroupPicker into an instance tracker by id, because it was already acting like one.
Updates llpanelpermissions RLVa bits and fixes last owner label never enabled
This commit is contained in:
Lirusaito
2013-07-13 17:28:09 -04:00
parent ffe403e0f0
commit 4ef32a3805
26 changed files with 199 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/xui/de/floater_choose_group.xml
View File

@@ -4,5 +4,4 @@
<button label="OK" label_selected="OK" name="OK"/>
<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
<string name="none">keine</string>
</floater>

1
indra/newview/skins/default/xui/de/panel_groups.xml
View File

@@ -19,5 +19,4 @@
<button label="Suchen..." name="Search..."/>
<button label="Invite..." name="Invite..."/>
<button label="Titles..." name="Titles..."/>
<string name="none">keine</string>
</panel>

1
indra/newview/skins/default/xui/de/panel_groups_horiz.xml
View File

@@ -18,5 +18,4 @@
<button label="Suchen..." name="Search..."/>
<button label="Invite..." name="Invite..."/>
<button label="Titles..." name="Titles..."/>
<string name="none">keine</string>
</panel>

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

@@ -1972,7 +1972,9 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="GodToolsObjectOwnedBy">Objekt [OBJECT], Besitzer [OWNER]</string>
<!-- groups -->
<string name="GroupsNone">
keine
</string>
<string name="Unknown">(unbekannt)</string>

3
indra/newview/skins/default/xui/en-us/floater_choose_group.xml
View File

@@ -18,7 +18,4 @@
<button bottom="-236" font="SansSerif" halign="center" height="20" label="Cancel"
label_selected="Cancel" left_delta="88" mouse_opaque="true" name="Cancel"
width="80" />
<string name="none">
none
</string>
</floater>

3
indra/newview/skins/default/xui/en-us/panel_groups.xml
View File

@@ -46,7 +46,4 @@
label="Invite..." name="Invite..." width="80" />
<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
label="Titles..." name="Titles..." width="80" />
<string name="none">
none
</string>
</panel>

3
indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml
View File

@@ -45,7 +45,4 @@
label="Invite..." name="Invite..." width="80" />
<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
label="Titles..." name="Titles..." width="80" />
<string name="none">
none
</string>
</panel>

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

@@ -3208,6 +3208,7 @@ The
<string name="GodToolsObjectOwnedBy">Object [OBJECT] owned by [OWNER]</string>
<!-- groups -->
<string name="GroupsNone">none</string>
<string name="Group" value=" (group)" />
<string name="Unknown">(Unknown)</string>
<string name="SummaryForTheWeek" value="Summary for this week, beginning on " />

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

@@ -5,7 +5,4 @@
</text>
<button label="OK" label_selected="OK" name="OK"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<string name="none">
ninguno
</string>
</floater>

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

@@ -22,7 +22,4 @@
<button label="Buscar..." name="Search..."/>
<button label="Invitar..." name="Invite..."/>
<button label="Títulos..." name="Titles..."/>
<string name="none">
ninguno
</string>
</panel>

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

@@ -22,7 +22,4 @@
<button label="Buscar..." left_delta="87" name="Search..." width="85"/>
<button label="Invitar..." name="Invite..." width="85"/>
<button label="Títulos..." left_delta="87" name="Titles..." width="85"/>
<string name="none">
ninguno
</string>
</panel>

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

@@ -3125,6 +3125,9 @@ La
<string name="GodToolsObjectOwnedBy">Objeto [OBJECT] propiedad de [OWNER]</string>
<!-- groups -->
<string name="GroupsNone">
ninguno
</string>
<string name="Group" value=" (grupo)" />
<string name="Unknown">(Desconocido)</string>
<string name="SummaryForTheWeek" value="Sumario para esta semana, comenzada el " />

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

@@ -5,7 +5,4 @@
</text>
<button label="OK" label_selected="OK" name="OK"/>
<button label="Annuler" label_selected="Annuler" name="Cancel"/>
<string name="none">
aucun
</string>
</floater>

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

@@ -44,8 +44,5 @@
label="Inviter" name="Invite..." width="80" />
<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
label="Titres" name="Titles..." width="80" />
<string name="none">
Aucun
</string>
</panel>

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

@@ -458,6 +458,9 @@
<string name="InventoryNoTexture">
Vous n&apos;avez pas de copie de cette texture dans votre inventaire
</string>
<string name="GroupsNone">
aucun
</string>
<string name="conference-title">
Chat à plusieurs
</string>

4
indra/newview/skins/default/xui/pt/strings.xml
View File

@@ -209,6 +209,10 @@
Você não possui uma cópia desta textura no seu inventário
</string>
<string name="GroupsNone">
nenhum
</string>
<string name="conference-title">
Bate-papo com várias pessoas
</string>