Merge remote-tracking branch 'shyotl/sunshine'

This commit is contained in:
Latif Khalifa
2013-01-31 17:20:58 +01:00
14 changed files with 442 additions and 400 deletions

View File

@@ -1,7 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-380" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" height="350" left="400" min_height="200" min_width="375"
can_resize="true" height="350" left="400" min_height="200" min_width="340"
mouse_opaque="true" name="avatarpicker" title="Choose Resident" width="375">
<string
name="not_found">
&apos;[TEXT]&apos; not found
</string>
<string
name="no_one_near">
No one near
</string>
<string
name="no_results">
No results
</string>
<string
name="searching">
Searching...
</string>
<!-- For multiple person selection, use "Select" and "Close"
instead of "OK" and "Cancel" because "Cancel" still keeps the ones
you have already selected. The code will show the appropriate
set of buttons. -->
<string name="Select">Select</string>
<string name="Close">Close</string>
<tab_container bottom="30" follows="left|right|top|bottom" height="300" left="4"
name="ResidentChooserTabs" tab_position="top" tab_width="65" width="365">
@@ -29,19 +51,23 @@
multi_select="false" name="SearchResults" width="115" />
</panel>
<panel name="CallingCardsPanel" label="Calling Cards"
<panel name="FriendsPanel" label="Friends"
border="true" bottom="0" height="150" left="0" width="135"
mouse_opaque="true">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="InstructSelectCallingCard" v_pad="0"
mouse_opaque="true" name="InstructSelectFriend" v_pad="0"
width="220">
Select a calling card:
Select a person:
</text>
<inventory_panel allow_multi_select="false" border="true" bottom_delta="-117"
<button bottom_delta="-3" left_delta="25" width="90" height="20" follows="top|right"
label="Refresh List" label_selected="Refresh List" halign="center"
font="SansSerif" mouse_opaque="true" name="RefreshFriends" scale_image="TRUE" />
<scroll_list background_visible="true" bottom_delta="-115" column_padding="5"
draw_border="true" draw_heading="false" draw_stripes="true"
follows="left|top|right|bottom" height="110" left="10" mouse_opaque="true"
name="InventoryPanel" sort_order="AvatarPickerSortOrder" width="115" />
multi_select="false" name="Friends" width="115" />
</panel>
<panel name="NearMePanel" label="Near Me"
@@ -88,23 +114,11 @@
</panel>
</tab_container>
<button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"
width="95" height="20" label="Select" label_selected="Select" mouse_opaque="true"
name="Select" scale_image="TRUE" />
<button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"
width="95" height="20" label="OK" label_selected="OK" mouse_opaque="true"
name="ok_btn" scale_image="TRUE" />
<button bottom_delta="0" right="240" follows="left|bottom" font="SansSerif" halign="center"
width="95" height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true"
name="Cancel" scale_image="TRUE" />
name="cancel_btn" scale_image="TRUE" />
<string name="not_found">
&apos;[TEXT]&apos; not found
</string>
<string name="no_one_near">
No-one near
</string>
<string name="no_results">
No results
</string>
<string name="searching">
Searching...
</string>
</floater>

View File

@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="avatarpicker" title="Elegir a un Residente">
<string name="not_found">
No se ha encontrado a '[TEXT]'
</string>
<string name="no_one_near">
Nadie Cercano
</string>
<string name="no_results">
Sin resultados
</string>
<string name="searching">
Buscando...
</string>
<string label="Elegir" label_selected="Elegir" name="Select">
Seleccionar
</string>
<string name="Close">
Cerrar
</string>
<tab_container name="ResidentChooserTabs">
<panel name="SearchPanel" label="Buscar">
<text name="InstructSearchResidentName">
@@ -7,10 +25,11 @@
</text>
<button label="Buscar" label_selected="Buscar" name="Find"/>
</panel>
<panel name="CallingCardsPanel" label="Tarjeta de Llamada">
<text name="InstructSelectCallingCard">
Elige una Tarjeta de Llamada:
<panel name="FriendsPanel" label="Amigos">
<text name="InstructSelectFriend">
Elige a una persona:
</text>
<button label="Actualizar Lista" label_selected="Actualizar Lista" name="RefreshFriends"/>
</panel>
<panel name="NearMePanel" label="Cercanos">
<text name="InstructSelectResident">
@@ -29,18 +48,6 @@
</text>
</panel>
</tab_container>
<button label="Elegir" label_selected="Elegir" name="Select"/>
<button label="OK" label_selected="OK" name="Select"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<string name="not_found">
No se ha encontrado a '[TEXT]'
</string>
<string name="no_one_near">
Nadie Cercano
</string>
<string name="no_results">
Sin resultados
</string>
<string name="searching">
Buscando...
</string>
</floater>

View File

@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="avatarpicker" title="Choisir le résident">
<string name="not_found">
'[TEXT]' introuvable
</string>
<string name="no_one_near">
Il n'y a personne près de vous
</string>
<string name="no_results">
Aucun résultat
</string>
<string name="searching">
Recherche...
</string>
<string label="OK" label_selected="OK" name="Select">
Sélectionner
</string>
<string name="Close">
Fermer
</string>
<tab_container name="ResidentChooserTabs">
<panel label="Rechercher" name="SearchPanel">
<text name="InstructSearchResidentName">
@@ -7,10 +25,11 @@
</text>
<button label="Trouver" label_selected="Trouver" name="Find"/>
</panel>
<panel name="CallingCardsPanel" label="Cartes de visite">
<text name="InstructSelectCallingCard">
Sélectionner une carte de visite:
<panel name="FriendsPanel" label="Amis">
<text name="InstructSelectFriend">
Sélectionner une personne:
</text>
<button font="SansSerifSmall" label="Rafraîchir la liste" label_selected="Rafraîchir la liste" name="RefreshFriends" left_delta="10" width="105"/>
</panel>
<panel name="NearMePanel" label="Près de moi">
<text name="InstructSelectResident">
@@ -29,18 +48,6 @@
</text>
</panel>
</tab_container>
<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
<button label="Annuler" label_selected="Annuler" name="Cancel"/>
<string name="not_found">
'[TEXT]' introuvable
</string>
<string name="no_one_near">
Il n'y a personne près de vous
</string>
<string name="no_results">
Aucun résultat
</string>
<string name="searching">
Recherche...
</string>
<button label="OK" label_selected="OK" name="ok_btn"/>
<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
</floater>