aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorelektrahesse2010-09-17 19:18:26 +0200
committerelektrahesse2010-09-17 19:18:26 +0200
commitf61f51866adb9b805cb7648d97ec9b23a89e2a4f (patch)
tree0cb5237b1ceaf1ed7f9356719b073a1c8bf202fa /linden/indra
parentMerge branch 'weekly' of git://github.com/mccabe/imprudence into weekly (diff)
parentMerge remote branch 'elektra/weekly' into weekly (diff)
downloadmeta-impy-f61f51866adb9b805cb7648d97ec9b23a89e2a4f.zip
meta-impy-f61f51866adb9b805cb7648d97ec9b23a89e2a4f.tar.gz
meta-impy-f61f51866adb9b805cb7648d97ec9b23a89e2a4f.tar.bz2
meta-impy-f61f51866adb9b805cb7648d97ec9b23a89e2a4f.tar.xz
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/llaudio/audioengine.cpp2
-rw-r--r--linden/indra/newview/llcallingcard.cpp5
-rw-r--r--linden/indra/newview/llcallingcard.h3
-rw-r--r--linden/indra/newview/llfloaterfriends.cpp79
-rw-r--r--linden/indra/newview/llfloaterfriends.h6
-rw-r--r--linden/indra/newview/llfloatergodtools.cpp4
-rw-r--r--linden/indra/newview/llfloatergroups.cpp55
-rw-r--r--linden/indra/newview/llfloatergroups.h3
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_env_settings.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_font_test.xml85
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_gesture.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_god_tools.xml26
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml119
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_group_info.xml35
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_group_titles.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_html.xml1
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_image_preview.xml3
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_inspect.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_instant_message.xml13
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml100
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml147
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_inventory.xml63
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml10
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_joystick.xml178
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml657
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_friends.xml39
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_groups.xml7
30 files changed, 711 insertions, 962 deletions
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 728f054..1900c38 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -762,7 +762,7 @@ LLAudioChannel * LLAudioEngine::getFreeChannel(const F32 priority)
762 { 762 {
763 LLAudioChannel *channelp = mChannels[i]; 763 LLAudioChannel *channelp = mChannels[i];
764 LLAudioSource *sourcep = channelp->getSource(); 764 LLAudioSource *sourcep = channelp->getSource();
765 if (sourcep->getPriority() < min_priority) 765 if (sourcep && sourcep->getPriority() < min_priority)
766 { 766 {
767 min_channelp = channelp; 767 min_channelp = channelp;
768 min_priority = sourcep->getPriority(); 768 min_priority = sourcep->getPriority();
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index db28c7a..155fb60 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -357,6 +357,11 @@ void LLAvatarTracker::setBuddyOnline(const LLUUID& id, bool is_online)
357 } 357 }
358} 358}
359 359
360S32 LLAvatarTracker::getBuddyCount()
361{
362 return mBuddyInfo.size();
363}
364
360bool LLAvatarTracker::isBuddyOnline(const LLUUID& id) const 365bool LLAvatarTracker::isBuddyOnline(const LLUUID& id) const
361{ 366{
362 LLRelationship* info = get_ptr_in_map(mBuddyInfo, id); 367 LLRelationship* info = get_ptr_in_map(mBuddyInfo, id);
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index 85a1ab6..0db5376 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -129,6 +129,9 @@ public:
129 void setBuddyOnline(const LLUUID& id, bool is_online); 129 void setBuddyOnline(const LLUUID& id, bool is_online);
130 bool isBuddyOnline(const LLUUID& id) const; 130 bool isBuddyOnline(const LLUUID& id) const;
131 131
132 // get count of buddies
133 S32 getBuddyCount();
134
132 // simple empowered status 135 // simple empowered status
133 void setBuddyEmpowered(const LLUUID& id, bool is_empowered); 136 void setBuddyEmpowered(const LLUUID& id, bool is_empowered);
134 bool isBuddyEmpowered(const LLUUID& id) const; 137 bool isBuddyEmpowered(const LLUUID& id) const;
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index e18e705..67d9626 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -151,7 +151,7 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
151 LLDynamicArray<LLUUID> selected_friends = getSelectedIDs(); 151 LLDynamicArray<LLUUID> selected_friends = getSelectedIDs();
152 if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE)) 152 if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
153 { 153 {
154 refreshNames(changed_mask); 154 refreshNames(changed_mask, "");
155 } 155 }
156 else if(changed_mask & LLFriendObserver::POWERS) 156 else if(changed_mask & LLFriendObserver::POWERS)
157 { 157 {
@@ -183,6 +183,28 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
183 mShowMaxSelectWarning = true; 183 mShowMaxSelectWarning = true;
184} 184}
185 185
186void LLPanelFriends::filterContacts(const std::string& search_string)
187{
188 if (search_string.empty())
189 {
190 refreshNames(LLFriendObserver::ADD, "");
191 }
192 else
193 {
194 refreshNames(LLFriendObserver::ADD, search_string);
195 }
196 refreshUI();
197}
198
199void LLPanelFriends::onContactSearchKeystroke(const std::string& search_string, void* user_data)
200{
201 LLPanelFriends* panelp = (LLPanelFriends*)user_data;
202 if (panelp)
203 {
204 panelp->filterContacts(search_string);
205 }
206}
207
186// virtual 208// virtual
187BOOL LLPanelFriends::postBuild() 209BOOL LLPanelFriends::postBuild()
188{ 210{
@@ -193,8 +215,14 @@ BOOL LLPanelFriends::postBuild()
193 childSetCommitCallback("friend_list", onSelectName, this); 215 childSetCommitCallback("friend_list", onSelectName, this);
194 childSetDoubleClickCallback("friend_list", onClickIM); 216 childSetDoubleClickCallback("friend_list", onClickIM);
195 217
218 LLSearchEditor* buddy_search = getChild<LLSearchEditor>("buddy_search");
219 if (buddy_search)
220 {
221 buddy_search->setSearchCallback(&onContactSearchKeystroke, this);
222 }
223
196 U32 changed_mask = LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE; 224 U32 changed_mask = LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE;
197 refreshNames(changed_mask); 225 refreshNames(changed_mask, "");
198 226
199 childSetAction("im_btn", onClickIM, this); 227 childSetAction("im_btn", onClickIM, this);
200 childSetAction("profile_btn", onClickProfile, this); 228 childSetAction("profile_btn", onClickProfile, this);
@@ -401,7 +429,7 @@ struct SortFriendsByID
401 } 429 }
402}; 430};
403 431
404void LLPanelFriends::refreshNames(U32 changed_mask) 432void LLPanelFriends::refreshNames(U32 changed_mask, const std::string& filter_string)
405{ 433{
406 LLDynamicArray<LLUUID> selected_ids = getSelectedIDs(); 434 LLDynamicArray<LLUUID> selected_ids = getSelectedIDs();
407 S32 pos = mFriendsList->getScrollPos(); 435 S32 pos = mFriendsList->getScrollPos();
@@ -412,14 +440,49 @@ void LLPanelFriends::refreshNames(U32 changed_mask)
412 440
413 BOOL have_names = TRUE; 441 BOOL have_names = TRUE;
414 442
415 if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE)) 443 // I hate doing it this way. There's no need for it. I blame LL -- MC
444 if (filter_string.empty())
416 { 445 {
417 have_names &= refreshNamesSync(all_buddies); 446 if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE))
418 } 447 {
448 have_names &= refreshNamesSync(all_buddies);
449 }
419 450
420 if(changed_mask & LLFriendObserver::ONLINE) 451 if(changed_mask & LLFriendObserver::ONLINE)
452 {
453 have_names &= refreshNamesPresence(all_buddies);
454 }
455 }
456 else
421 { 457 {
422 have_names &= refreshNamesPresence(all_buddies); 458 std::string firstname;
459 std::string lastname;
460 utf8str_tolower(filter_string);
461 LLAvatarTracker::buddy_map_t temp_buddies;
462
463 for (LLAvatarTracker::buddy_map_t::reverse_iterator bIt = all_buddies.rbegin();
464 bIt != all_buddies.rend(); ++bIt)
465 {
466 llinfos << (*bIt).first << llendl;
467 if (gCacheName->getName((*bIt).first, firstname, lastname))
468 {
469 std::string test_name(firstname + " " + lastname);
470 if ((utf8str_tolower(test_name)).find(filter_string) != std::string::npos)
471 {
472 llinfos << "inserting: " << test_name << " from filter: " << filter_string << llendl;
473 temp_buddies.insert(temp_buddies.begin(), *bIt);
474 }
475 }
476 }
477 if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE))
478 {
479 have_names &= refreshNamesSync(temp_buddies);
480 }
481
482 if(changed_mask & LLFriendObserver::ONLINE)
483 {
484 have_names &= refreshNamesPresence(temp_buddies);
485 }
423 } 486 }
424 487
425 if (!have_names) 488 if (!have_names)
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index f7f0b32..8206362 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -100,7 +100,9 @@ private:
100 100
101 // protected members 101 // protected members
102 typedef std::map<LLUUID, S32> rights_map_t; 102 typedef std::map<LLUUID, S32> rights_map_t;
103 void refreshNames(U32 changed_mask); 103 void refreshNames(U32 changed_mask, const std::string& filter_string);
104 void filterContacts(const std::string& search_string);
105
104 BOOL refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies); 106 BOOL refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies);
105 BOOL refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies); 107 BOOL refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies);
106 void refreshUI(); 108 void refreshUI();
@@ -126,7 +128,7 @@ private:
126 static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response); 128 static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response);
127 static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data); 129 static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data);
128 static void onMaximumSelect(void* user_data); 130 static void onMaximumSelect(void* user_data);
129 131 static void onContactSearchKeystroke(const std::string& search_string, void* user_data);
130 static void onClickIM(void* user_data); 132 static void onClickIM(void* user_data);
131 static void onClickProfile(void* user_data); 133 static void onClickProfile(void* user_data);
132 static void onClickAddFriend(void* user_data); 134 static void onClickAddFriend(void* user_data);
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 4959a29..2bbbc65 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -77,6 +77,8 @@
77#include "lltransfertargetfile.h" 77#include "lltransfertargetfile.h"
78#include "lltransfersourcefile.h" 78#include "lltransfersourcefile.h"
79 79
80#include "hippoGridManager.h"
81
80const F32 SECONDS_BETWEEN_UPDATE_REQUESTS = 5.0f; 82const F32 SECONDS_BETWEEN_UPDATE_REQUESTS = 5.0f;
81 83
82static LLFloaterGodTools* sGodTools = NULL; 84static LLFloaterGodTools* sGodTools = NULL;
@@ -135,6 +137,8 @@ LLFloaterGodTools::LLFloaterGodTools()
135 sendRegionInfoRequest(); 137 sendRegionInfoRequest();
136 138
137 childShowTab("GodTools Tabs", "region"); 139 childShowTab("GodTools Tabs", "region");
140
141 childSetTextArg("land cost text", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
138} 142}
139 143
140// static 144// static
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index daf1709..a85ce9d 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -214,6 +214,12 @@ BOOL LLPanelGroups::postBuild()
214{ 214{
215 childSetCommitCallback("group list", onGroupList, this); 215 childSetCommitCallback("group list", onGroupList, this);
216 216
217 LLSearchEditor* group_search = getChild<LLSearchEditor>("group_search");
218 if (group_search)
219 {
220 group_search->setSearchCallback(&onGroupSearchKeystroke, this);
221 }
222
217 childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count())); 223 childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
218 childSetTextArg("groupcount", "[MAX]", llformat("%d", gHippoLimits->getMaxAgentGroups())); 224 childSetTextArg("groupcount", "[MAX]", llformat("%d", gHippoLimits->getMaxAgentGroups()));
219 225
@@ -379,7 +385,7 @@ void LLPanelGroups::info()
379 385
380void LLPanelGroups::startIM() 386void LLPanelGroups::startIM()
381{ 387{
382 //llinfos << "LLPanelFriends::onClickIM()" << llendl; 388 //llinfos << "LLPanelGroups::onClickIM()" << llendl;
383 LLCtrlListInterface *group_list = childGetListInterface("group list"); 389 LLCtrlListInterface *group_list = childGetListInterface("group list");
384 LLUUID group_id; 390 LLUUID group_id;
385 391
@@ -550,7 +556,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const s
550 element["id"] = LLUUID::null; 556 element["id"] = LLUUID::null;
551 element["columns"][0]["column"] = "name"; 557 element["columns"][0]["column"] = "name";
552 //UGLY hack to make sure "none" is always on top -- MC 558 //UGLY hack to make sure "none" is always on top -- MC
553 element["columns"][0]["value"] = " (" + none_text + ")"; 559 element["columns"][0]["value"] = " (" + none_text + ")";
554 element["columns"][0]["font"] = "SANSSERIF"; 560 element["columns"][0]["font"] = "SANSSERIF";
555 element["columns"][0]["font-style"] = style; 561 element["columns"][0]["font-style"] = style;
556 562
@@ -612,3 +618,48 @@ void LLPanelGroups::applyChangesToGroups()
612 } 618 }
613 } 619 }
614} 620}
621
622void LLPanelGroups::filterContacts(const std::string& search_string)
623{
624 std::string search = search_string;
625 LLStringUtil::toLower(search);
626
627 if (search.empty())
628 {
629 // repopulate
630 reset();
631 }
632 else
633 {
634 LLScrollListCtrl* group_list = getChild<LLScrollListCtrl>("group list");
635 if (group_list)
636 {
637 // don't worry about maintaining selection since we're searching
638 std::vector<LLScrollListItem*> vGroups(group_list->getAllData());
639
640 // this should really REALLY use deleteAllItems() to rebuild the list instead
641 std::string group_name;
642 for (std::vector<LLScrollListItem*>::iterator itr = vGroups.begin(); itr != vGroups.end(); ++itr)
643 {
644 group_name = (*itr)->getColumn(0)->getValue().asString();
645 LLStringUtil::toLower(group_name);
646 BOOL show_entry = (group_name.find(search) != std::string::npos);
647 if (!show_entry)
648 {
649 group_list->deleteItems((*itr)->getValue());
650 }
651 }
652 group_list->setScrollPos(0);
653 enableButtons();
654 }
655 }
656}
657
658void LLPanelGroups::onGroupSearchKeystroke(const std::string& search_string, void* user_data)
659{
660 LLPanelGroups* panelp = (LLPanelGroups*)user_data;
661 if (panelp)
662 {
663 panelp->filterContacts(search_string);
664 }
665}
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index 91021f0..5dc7ad8 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -115,6 +115,7 @@ protected:
115 static void onBtnInvite(void* userdata); 115 static void onBtnInvite(void* userdata);
116 static void onBtnTitles(void* userdata); 116 static void onBtnTitles(void* userdata);
117 static void onDoubleClickGroup(void* userdata); 117 static void onDoubleClickGroup(void* userdata);
118 static void onGroupSearchKeystroke(const std::string& search_string, void* user_data);
118 119
119 void create(); 120 void create();
120 void activate(); 121 void activate();
@@ -125,9 +126,9 @@ protected:
125 void callVote(); 126 void callVote();
126 void invite(); 127 void invite();
127 void titles(); 128 void titles();
129 void filterContacts(const std::string& search_string);
128 130
129 static bool callbackLeaveGroup(const LLSD& notification, const LLSD& response); 131 static bool callbackLeaveGroup(const LLSD& notification, const LLSD& response);
130
131}; 132};
132 133
133 134
diff --git a/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
index 3717ff6..923b9af 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
@@ -4,7 +4,7 @@
4 Tageszeit 4 Tageszeit
5 </text> 5 </text>
6 <text name="EnvTimeText2"> 6 <text name="EnvTimeText2">
7 12:00 7 Tageszeit
8 </text> 8 </text>
9 <text name="EnvCloudText"> 9 <text name="EnvCloudText">
10 Wolkendecke 10 Wolkendecke
diff --git a/linden/indra/newview/skins/default/xui/de/floater_font_test.xml b/linden/indra/newview/skins/default/xui/de/floater_font_test.xml
index 54278fc..cea1fd4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_font_test.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_font_test.xml
@@ -1,5 +1,90 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="contents" title="Schriftart-Test"> 2<floater name="contents" title="Schriftart-Test">
3
4<text font="SansSerif">
5SansSerif, keine Größe oder Stil (sollte gleich medium sein)
6</text>
7
8<text font="SansSerifLarge" follows="left|top|right" bottom_delta="-20" left="16" height="16">
9SansSerifGroß
10</text>
11
12<text font="SansSerifHuge" follows="left|top|right" bottom_delta="-36" left="16" height="32">
13SansSerifExtraGroß
14</text>
15
16<text font="Monospace" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_size="Large">
17Monospace Größe=Groß
18</text>
19
20<text font="SansSerifLarge" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_style="BOLD">
21SansSerifGroß Stil=FETT
22</text>
23
24<text font="SansSerifBold" follows="left|top|right" bottom_delta="-20" left="16" height="16">
25SansSerifFett
26</text>
27
28<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_style="BOLD">
29SansSerif Stil=FETT (sollte gleich SansSerifFett sein)
30</text>
31
32<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="ITALIC">
33SansSerif Stil=KURSIV
34</text>
35
36<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC">
37SansSerif Stil=FETT|KURSIV
38</text>
39
40<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC|DROP_SHADOW_SOFT">
41SansSerif Stil=FETT|KURSIV|SANFTER_SCHATTEN
42</text>
43
44<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="UNDERLINE">
45SansSerif Stil=UNTERSTRICHEN
46</text>
47
48<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="DROP_SHADOW">
49SansSerif Stil=SCHATTEN
50</text>
51
52<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="DROP_SHADOW_SOFT">
53SansSerif Stil=SANFTER_SCHATTEN
54</text>
55
56<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD">
57DejaVu Stil=FETT
58</text>
59
60<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="ITALIC">
61DejaVu Stil=KURSIV
62</text>
63
64<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC">
65DejaVu Stil=FETT|KURSIV
66</text>
67
68<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_size="Large" font-style="BOLD|ITALIC">
69DejaVu Größe=Groß Stil=FETT|KURSIV
70</text>
71
72<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD">
73Helvetica Stil=FETT
74</text>
75
76<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="ITALIC">
77Helvetica Stil=KURSIV
78</text>
79
80<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC">
81Helvetica Stil=FETT|KURSIV
82</text>
83
84<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_size="Large" font-style="BOLD|ITALIC">
85Helvetica Größe=Groß Stil=FETT|KURSIV
86</text>
87
3 <text name="linea"> 88 <text name="linea">
4 OverrideTest, sollte hier als Times angezeigt werden. (Aus default/xui/en-us) 89 OverrideTest, sollte hier als Times angezeigt werden. (Aus default/xui/en-us)
5 </text> 90 </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_gesture.xml b/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
index bdee3b8..bccd66f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
@@ -4,8 +4,8 @@
4 Doppelklicken Sie auf eine Geste, um Animationen und Sound &#10;abzuspielen. 4 Doppelklicken Sie auf eine Geste, um Animationen und Sound &#10;abzuspielen.
5 </text> 5 </text>
6 <scroll_list bottom_delta="-385" height="360" name="gesture_list"> 6 <scroll_list bottom_delta="-385" height="360" name="gesture_list">
7 <column label="Trigger" name="trigger" /> 7 <column label="Auslöser" name="trigger" />
8 <column label="Key" name="shortcut" /> 8 <column label="Schlüssel" name="shortcut" />
9 <column label="" name="key" /> 9 <column label="" name="key" />
10 <column label="Name" name="name" /> 10 <column label="Name" name="name" />
11 </scroll_list> 11 </scroll_list>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
index dcb6982..a96aeae 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -12,11 +12,11 @@
12 <text name="Sim Name:" width="55"> 12 <text name="Sim Name:" width="55">
13 Sim-Name: 13 Sim-Name:
14 </text> 14 </text>
15 <check_box label="Startbereich Einleitung" name="check prelude" 15 <check_box label="Startbereich" name="check prelude"
16 tool_tip="Diese Region zu einem Startbereich machen." /> 16 tool_tip="Diese Region zu einem Startbereich machen." />
17 <check_box label="Sonne fest" name="check fixed sun" 17 <check_box label="Sonne fest" name="check fixed sun"
18 tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ &gt; „Terrain“." /> 18 tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ &gt; „Terrain“." />
19 <check_box label="Zuhause auf Teleport &#10;zurücksetzen" name="check reset home" 19 <check_box label="Zuhause bei Teleport &#10;zurücksetzen" name="check reset home"
20 tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." height="32" /> 20 tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." height="32" />
21 <check_box label="Sichtbar" name="check visible" 21 <check_box label="Sichtbar" name="check visible"
22 tool_tip="Diese Region für Nicht-Götter sichtbar machen." bottom_delta="-32" /> 22 tool_tip="Diese Region für Nicht-Götter sichtbar machen." bottom_delta="-32" />
@@ -25,7 +25,7 @@
25 <check_box label="Trafficüberwachung blockieren" name="block dwell" 25 <check_box label="Trafficüberwachung blockieren" name="block dwell"
26 tool_tip="In dieser Region die Traffic-Berechnung abschalten." /> 26 tool_tip="In dieser Region die Traffic-Berechnung abschalten." />
27 <check_box label="Terraformen blockieren" name="block terraform" 27 <check_box label="Terraformen blockieren" name="block terraform"
28 tool_tip="Das Terraformen von Land verbieten (Benutzen Sie dies um Leuten das Terraformen ihres Landes zu verbieten)" /> 28 tool_tip="Das Terraformen von Land verbieten (Benutzen Sie dies, um Leuten das Terraformen ihres Landes zu verbieten)" />
29 <check_box label="Sandkasten" name="is sandbox" 29 <check_box label="Sandkasten" name="is sandbox"
30 tool_tip="Sandkastenregion ein-/ausschalten." /> 30 tool_tip="Sandkastenregion ein-/ausschalten." />
31 <button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain" 31 <button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain"
@@ -56,7 +56,7 @@
56 Abrechnungsfaktor: 56 Abrechnungsfaktor:
57 </text> 57 </text>
58 <text name="land cost text"> 58 <text name="land cost text">
59 L$ pro qm: 59 [CURRENCY] pro qm:
60 </text> 60 </text>
61 <button label="Aktualisieren" label_selected="Aktualisieren" name="Refresh" 61 <button label="Aktualisieren" label_selected="Aktualisieren" name="Refresh"
62 tool_tip="Klicken Sie hier, um die obigen Informationen zu aktualisieren." /> 62 tool_tip="Klicken Sie hier, um die obigen Informationen zu aktualisieren." />
@@ -76,8 +76,8 @@
76 <text name="region name"> 76 <text name="region name">
77 Welsh 77 Welsh
78 </text> 78 </text>
79 <check_box label="Skripts &#10;deaktivieren" name="disable scripts" 79 <check_box label="Skripte &#10;deaktivieren" name="disable scripts"
80 tool_tip="Skripts in dieser Region komplett abschalten" /> 80 tool_tip="Skripte in dieser Region komplett abschalten" />
81 <check_box label="Kollisionen &#10;deaktivieren" name="disable collisions" 81 <check_box label="Kollisionen &#10;deaktivieren" name="disable collisions"
82 tool_tip="Nicht-Avatar-Kollisionen in dieser Region komplett abschalten" /> 82 tool_tip="Nicht-Avatar-Kollisionen in dieser Region komplett abschalten" />
83 <check_box label="Physik deaktivieren" name="disable physics" 83 <check_box label="Physik deaktivieren" name="disable physics"
@@ -96,7 +96,7 @@
96 <button label="Geskriptete Objekte des Ziels auf *allen* Ländern löschen" 96 <button label="Geskriptete Objekte des Ziels auf *allen* Ländern löschen"
97 label_selected="Geskriptete Objekte des Ziels auf *allen* Ländern löschen" 97 label_selected="Geskriptete Objekte des Ziels auf *allen* Ländern löschen"
98 name="Delete Target&apos;s Scripted Objects On *Any* Land" 98 name="Delete Target&apos;s Scripted Objects On *Any* Land"
99 tool_tip="Alle dem Ziel gehörenden geskripteten Objekte in dieser Region löschen. Objekte (nicht kopierfähig) werden zurückgegeben." /> 99 tool_tip="Alle dem Ziel gehörenden geskripteten Objekte auf Land, das nicht dem Ziel gehört löschen. Objekte (nicht kopierfähig) werden zurückgegeben." />
100 <button label="*ALLE* Objekte des Ziels löschen" 100 <button label="*ALLE* Objekte des Ziels löschen"
101 label_selected="*ALLE* Objekte des Ziels löschen" 101 label_selected="*ALLE* Objekte des Ziels löschen"
102 name="Delete *ALL* Of Target&apos;s Objects" 102 name="Delete *ALL* Of Target&apos;s Objects"
@@ -104,11 +104,11 @@
104 <button label="Top-Kollisionsobjekte" label_selected="Top-Kollisionsobjekte" 104 <button label="Top-Kollisionsobjekte" label_selected="Top-Kollisionsobjekte"
105 name="Get Top Colliders" 105 name="Get Top Colliders"
106 tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." width="130" /> 106 tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." width="130" />
107 <button label="Top-Skripts" label_selected="Top-Skripts" name="Get Top Scripts" 107 <button label="Top-Skripte" label_selected="Top-Skripte" name="Get Top Scripts"
108 tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripts ausführen." width="130" /> 108 tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripte ausführen." width="130" />
109 <button label="Scripting-Übersicht" label_selected="Scripting-Übersicht" 109 <button label="Skripte-Übersicht" label_selected="Skripte-Übersicht"
110 name="Scripts digest" 110 name="Scripts digest"
111 tool_tip="Zeigt eine Liste aller Skripts mit Häufigkeit an." width="130" /> 111 tool_tip="Zeigt eine Liste aller Skripte mit Häufigkeit an." width="130" />
112 </panel> 112 </panel>
113 <panel label="Anfrage" name="request"> 113 <panel label="Anfrage" name="request">
114 <text name="Destination:"> 114 <text name="Destination:">
@@ -130,7 +130,7 @@
130 Kollisionsobjekte &lt;Schritte&gt; 130 Kollisionsobjekte &lt;Schritte&gt;
131 </combo_item> 131 </combo_item>
132 <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;"> 132 <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
133 Skripts &lt;Zähler&gt;,&lt;Optionales Muster&gt; 133 Skripte &lt;Zähler&gt;,&lt;Optionales Muster&gt;
134 </combo_item> 134 </combo_item>
135 <combo_item name="objects&lt;pattern&gt;"> 135 <combo_item name="objects&lt;pattern&gt;">
136 Objekte &lt;Muster&gt; 136 Objekte &lt;Muster&gt;
@@ -142,7 +142,7 @@
142 <text name="Parameter:"> 142 <text name="Parameter:">
143 Parameter: 143 Parameter:
144 </text> 144 </text>
145 <button label="Anfrage" label_selected="Anfrage" name="Make Request" /> 145 <button label="Anfragen" label_selected="Anfragen" name="Make Request" />
146 </panel> 146 </panel>
147 </tab_container> 147 </tab_container>
148</floater> 148</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml
new file mode 100644
index 0000000..21a4b36
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml
@@ -0,0 +1,9 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="default_grid"
3 title="Ein Standard-Netz aussuchen">
4 <text name="select_label">
5 Oder den Netz-Manager benutzen, um ein neues hinzuzufügen
6 </text>
7 <button label="Abbrechen" name="btn_cancel" />
8 <button label="OK" name="btn_ok" />
9</floater> \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml
new file mode 100644
index 0000000..dee3233
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml
@@ -0,0 +1,119 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="floater_login" title="Netz-Manager">
3
4 <!-- Grid Selector -->
5 <text name="grid_selector_label">
6 Netz aussuchen:
7 </text>
8
9 <scroll_list name="grid_selector">
10 <column label="Netzliste" name="grid" />
11 </scroll_list>
12
13 <!-- Grid Selector Buttons -->
14 <button label="Neues Netz" name="btn_add" />
15 <button label="Netz kopieren" name="btn_copy" />
16 <button label="Netz löschen" name="btn_delete" />
17
18 <!-- Grid Details -->
19 <text name="gridnick_text">
20 Netzname:
21 </text>
22
23 <!--
24 <text name="first_name_text">
25 Vorname:
26 </text>
27
28 <text name="last_name_text">
29 Nachname:
30 </text>
31
32 <text name="avatar_password_text">
33 Passwort:
34 </text>
35
36 <text name="start_location_text">
37 Startort:
38 </text>
39 <combo_box name="start_location_combo">
40 <combo_item name="MyHome" value="My Home">
41 Meine Heimat
42 </combo_item>
43 <combo_item name="MyLastLocation" value="My Last Location">
44 Mein letzter Ort
45 </combo_item>
46 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
47 &lt;Regionsname eingeben&gt;
48 </combo_item>
49 </combo_box>
50 -->
51
52 <text name="loginuri_text">
53 Einwahl-URI:
54 </text>
55
56 <button label="Netzinfo holen" name="btn_gridinfo" />
57 <button label="Info löschen" name="btn_clear" />
58
59 <text name="loginpage_text">
60 Netzinfo URLs:
61 </text>
62 <text name="loginpage_text">
63 Einwahl-Seite:
64 </text>
65
66 <text name="helperuri_text">
67 Helfer-URI:
68 </text>
69
70 <text name="website_text">
71 Internet-Seite:
72 </text>
73
74 <text name="support_text">
75 Support:
76 </text>
77
78 <text name="register_text">
79 Konto:
80 </text>
81
82 <text name="password_text">
83 Passwort:
84 </text>
85
86 <text name="websearch_text">
87 Internetsuche:
88 </text>
89
90 <!-- Combo box for multi avatar grid manager avatar name
91 <combo_box name="name_combo" />
92 -->
93 <!-- Buttons for multi avatar grid manager
94 <button label="Neu" label_selected="Neu" name="new_btn" />
95 -->
96 <!--
97 <button label="Löschen" label_selected="Löschen" name="remove_btn" />
98-->
99
100 <!-- Checkbox for selecting a global avatar (for when combo box avatar selector works)
101 <check_box label="Globaler Avatar" name="global_check" />
102 <check_box label="Passwort behalten" name="remember_check" />
103 <check_box label="Geheimgrad" name="gawd_mode" />
104 -->
105
106 <!-- Cancel/Connect Buttons -->
107
108 <!--
109 <button label="Als Standard setzen" label_selected="Als Standard setzen" name="set_default" />
110 -->
111
112 <!-- <button label="Verbinden" label_selected="Verbinden" name="connect_btn" /> -->
113 <button label="Übernehmen" label_selected="Übernehmen" name="btn_apply" />
114 <button label="Abbrechen" label_selected="Abrechen" name="btn_cancel" />
115 <button label="OK" label_selected="OK" name="btn_ok" />
116 <!--
117 <combo_box name="server_combo" />
118 -->
119</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_group_info.xml b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
index ff5abe9..d1c5163 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
@@ -15,10 +15,10 @@
15 Jede Person kann eine Gruppe erstellen. Eine Person kann maximal zu 15 Gruppen gehören. 15 Jede Person kann eine Gruppe erstellen. Eine Person kann maximal zu 15 Gruppen gehören.
16 </text> 16 </text>
17 <text name="txt4"> 17 <text name="txt4">
18 Gruppen müssen aus mindestens 3 Mitgliedern bestehen. 18 Aktive Gruppen müssen aus mindestens 3 Mitgliedern bestehen.
19 </text> 19 </text>
20 <text name="group_create_text"> 20 <text name="group_create_text">
21 Die Gründung einer Gruppe kostet 100 L$. 21 Die Gründung einer Gruppe kostet 100 [CURRENCY].
22 </text> 22 </text>
23 <text name="lbl"> 23 <text name="lbl">
24 Name: 24 Name:
@@ -33,20 +33,20 @@
33 <check_box label="Mitglieder in Gruppenliste anzeigen" name="sho_mem"/> 33 <check_box label="Mitglieder in Gruppenliste anzeigen" name="sho_mem"/>
34 <check_box label="Im Web veröffentlichen." name="allow_publish" tool_tip="Veröffentlicht Ihre Profilinformationen im Web."/> 34 <check_box label="Im Web veröffentlichen." name="allow_publish" tool_tip="Veröffentlicht Ihre Profilinformationen im Web."/>
35 <button label="?" label_selected="?" name="publish_help_btn"/> 35 <button label="?" label_selected="?" name="publish_help_btn"/>
36 <check_box label="Mature" name="mature" tool_tip="Ihre Profilinformationen sind als „Mature“ gekennzeichnet."/> 36 <check_box label="Reif" name="mature" tool_tip="Ihre Profilinformationen sind als „Reif“ gekennzeichnet."/>
37 </panel> 37 </panel>
38 <panel label="Titel" name="tit"> 38 <panel label="Titel" name="tit">
39 <text name="txt"> 39 <text name="txt">
40 Gruppentitel 40 Gruppentitel
41 </text> 41 </text>
42 <text name="txt2"> 42 <text name="txt2">
43 Gruppen können Officer und Mitglieder haben, jeweils mit besonderen Titeln. 43 Gruppen können Offiziere und Mitglieder haben, jeweils mit besonderen Titeln.
44 </text> 44 </text>
45 <text name="txt3"> 45 <text name="txt3">
46 Die Titel werden in der Welt, beim Chat und in IM vor dem Namen angezeigt. 46 Die Titel werden in der Welt, beim Chat und in IM vor dem Namen angezeigt.
47 </text> 47 </text>
48 <text name="lbl"> 48 <text name="lbl">
49 Officer-Titel: 49 Offizierstitel:
50 </text> 50 </text>
51 <text name="lbl2"> 51 <text name="lbl2">
52 Mitgliedstitel: 52 Mitgliedstitel:
@@ -61,13 +61,13 @@
61 Gruppenmitglieder 61 Gruppenmitglieder
62 </text> 62 </text>
63 <text name="txt2"> 63 <text name="txt2">
64 Aktuelle Officers und Gruppenmitglieder. 64 Aktuelle Offiziere und Gruppenmitglieder.
65 </text> 65 </text>
66 <text name="txt3"> 66 <text name="txt3">
67 Klicken Sie auf einen Namen, um das Mitgliedsprofil anzuzeigen. 67 Klicken Sie auf einen Namen, um das Mitgliedsprofil anzuzeigen.
68 </text> 68 </text>
69 <text name="lbl"> 69 <text name="lbl">
70 Officers: 70 Offiziere:
71 </text> 71 </text>
72 <text name="members_label"> 72 <text name="members_label">
73 Mitglieder: 73 Mitglieder:
@@ -82,7 +82,7 @@
82 </text> 82 </text>
83 <text name="instructions"> 83 <text name="instructions">
84 Klicken Sie auf „Wahl starten“, um eine neue Wahl zu starten. 84 Klicken Sie auf „Wahl starten“, um eine neue Wahl zu starten.
85Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind. 85Zu den Kandidaten gehören alle Mitglieder, die keine Offiziere sind.
86 </text> 86 </text>
87 <text name="lbl"> 87 <text name="lbl">
88 Kandidaten: 88 Kandidaten:
@@ -100,7 +100,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
100 <text name="lbl3"> 100 <text name="lbl3">
101 Mehrheit: 101 Mehrheit:
102 </text> 102 </text>
103 <radio_group name="majority" tool_tip="Majority of total votes needed to win."> 103 <radio_group name="majority" tool_tip="Mehrheit aller Stimmen zum Gewinn benötigt.">
104 <radio_item name="radio"> 104 <radio_item name="radio">
105 Einfache Mehrheit 105 Einfache Mehrheit
106 </radio_item> 106 </radio_item>
@@ -116,7 +116,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
116 </text> 116 </text>
117 <spinner name="duration" tool_tip="# Tage bis zum Ende der Wahl."/> 117 <spinner name="duration" tool_tip="# Tage bis zum Ende der Wahl."/>
118 <text name="duration_days"> 118 <text name="duration_days">
119 Tage 119 Tag
120 </text> 120 </text>
121 <text name="start_lbl"> 121 <text name="start_lbl">
122 Beginn der Wahl: 122 Beginn der Wahl:
@@ -130,7 +130,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
130 Gruppenanfragen 130 Gruppenanfragen
131 </text> 131 </text>
132 <text name="instructions"> 132 <text name="instructions">
133 Keine aktiven Anfragen. Klicken Sie auf „Neue Anfrage“, 133 Keine aktiven Anfragen. Klicken Sie auf „Neue Anfrage“,
134um eine neue Anfrage zu erstellen. 134um eine neue Anfrage zu erstellen.
135 </text> 135 </text>
136 <text name="proposal_lbl"> 136 <text name="proposal_lbl">
@@ -153,7 +153,7 @@ um eine neue Anfrage zu erstellen.
153 <text name="majority_lbl"> 153 <text name="majority_lbl">
154 Mehrheit: 154 Mehrheit:
155 </text> 155 </text>
156 <radio_group name="majority" tool_tip="Majority of total votes needed to win."> 156 <radio_group name="majority" tool_tip="Mehrheit aller Stimmen zum Gewinn benötigt.">
157 <radio_item name="radio"> 157 <radio_item name="radio">
158 Einfache Mehrheit 158 Einfache Mehrheit
159 </radio_item> 159 </radio_item>
@@ -183,7 +183,7 @@ um eine neue Anfrage zu erstellen.
183 Alte Gruppenabstimmungen 183 Alte Gruppenabstimmungen
184 </text> 184 </text>
185 <text name="instructions"> 185 <text name="instructions">
186 Sie können die Abstimmergebisse anzeigen, indem Sie die Abstimmung auswählen und auf 186 Sie können alte Abstimmergebisse anzeigen, indem Sie die Abstimmung auswählen und auf
187 </text> 187 </text>
188 <text name="instructions2"> 188 <text name="instructions2">
189 „Objekt anzeigen“ klicken. 189 „Objekt anzeigen“ klicken.
@@ -210,9 +210,9 @@ um eine neue Anfrage zu erstellen.
210 Klicken Sie auf „Hinzufügen“, um Benutzer zur Liste hinzuzufügen. 210 Klicken Sie auf „Hinzufügen“, um Benutzer zur Liste hinzuzufügen.
211 </text> 211 </text>
212 <text name="lbl"> 212 <text name="lbl">
213 Officers: 213 Offiziere:
214 </text> 214 </text>
215 <button label="Officer hinzufügen..." label_selected="Officer hinzufügen..." name="add_officer_btn"/> 215 <button label="Offiziere hinzufügen..." label_selected="Officer hinzufügen..." name="add_officer_btn"/>
216 <button label="Auswahl entfernen" label_selected="Auswahl entfernen" name="remove_officer_btn"/> 216 <button label="Auswahl entfernen" label_selected="Auswahl entfernen" name="remove_officer_btn"/>
217 <text name="lbl2"> 217 <text name="lbl2">
218 Mitglieder: 218 Mitglieder:
@@ -222,7 +222,7 @@ um eine neue Anfrage zu erstellen.
222 <text name="lbl3"> 222 <text name="lbl3">
223 Beitrittsgebühr: 223 Beitrittsgebühr:
224 </text> 224 </text>
225 <check_box label="Freier Beitritt (kein Einladung nötig)" name="open"/> 225 <check_box label="Freier Beitritt (keine Einladung nötig)" name="open"/>
226 </panel> 226 </panel>
227 <panel label="Land" name="land"> 227 <panel label="Land" name="land">
228 <text name="txt"> 228 <text name="txt">
@@ -245,7 +245,8 @@ um eine neue Anfrage zu erstellen.
245 </panel> 245 </panel>
246 <panel label="Geld" name="mon"> 246 <panel label="Geld" name="mon">
247 <tab_container name="group money history tab"> 247 <tab_container name="group money history tab">
248 <panel label="Planung" name="money panel"/> 248 <panel label="Planung" name="money panel" />
249 </panel>
249 <panel label="Details" name="money panel2"> 250 <panel label="Details" name="money panel2">
250 <button label="&lt; Früher" label_selected="&lt; Früher" name="&lt; Earlier" tool_tip="Zurück in der Zeit"/> 251 <button label="&lt; Früher" label_selected="&lt; Früher" name="&lt; Earlier" tool_tip="Zurück in der Zeit"/>
251 <button label="Später &gt;" label_selected="Später &gt;" name="Later &gt;" tool_tip="Weiter in der Zeit"/> 252 <button label="Später &gt;" label_selected="Später &gt;" name="Later &gt;" tool_tip="Weiter in der Zeit"/>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_group_titles.xml b/linden/indra/newview/skins/default/xui/de/floater_group_titles.xml
new file mode 100644
index 0000000..4d3430d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_group_titles.xml
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="goup titles" title="Gruppentitel">
3 <scroll_list name="titles_list">
4 <column name="title" label="Titel"/>
5 <column name="group_name" label="Gruppe" />
6 </scroll_list>
7 <button name="activate" label="Aktivieren" tool_tip="Den gewünschten Gruppentitel aktivieren" />
8</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 37f9ea5..7bf1bad 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -2,7 +2,6 @@
2<floater name="htmlfloater" title=""> 2<floater name="htmlfloater" title="">
3 <button label="Schließen" name="close_btn" /> 3 <button label="Schließen" name="close_btn" />
4 <button label="Zurück" name="back_btn" /> 4 <button label="Zurück" name="back_btn" />
5 <button label="Zuhause" name="home_btn" />
6 <button label="Weiter" name="forward_btn" /> 5 <button label="Weiter" name="forward_btn" />
7 <button label="Los" name="go_btn" /> 6 <button label="Los" name="go_btn" />
8 <string name="home_page_url"> 7 <string name="home_page_url">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
index 145e0bb..a851da8 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
@@ -47,6 +47,7 @@
47Speichern Sie das Bild als 24 Bit Targa (.tga). 47Speichern Sie das Bild als 24 Bit Targa (.tga).
48 </text> 48 </text>
49 <check_box label="Verlustfreie Komprimierung verwenden" name="lossless_check" /> 49 <check_box label="Verlustfreie Komprimierung verwenden" name="lossless_check" />
50 <check_box label="Temporäres Bild (Kostenlos)" name="temp_check" tooltip="Setzt die Speicherung auf temporär. Damit ist das Bild kostenlos, aber verschwindet nach einer kurzen Zeit." />
50 <button label="Abbrechen" name="cancel_btn" /> 51 <button label="Abbrechen" name="cancel_btn" />
51 <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" /> 52 <button label="Hochladen ([UPLOADFEE])" name="ok_btn" />
52</floater> 53</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inspect.xml b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
index f8c9b62..d27ac9d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="inspect" title="Objekt prüfen" min_width="450" > 2<floater name="inspect" title="Objekt prüfen" min_width="450" >
3 <scroll_list name="object_list" 3 <scroll_list name="object_list"
4 tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren"> 4 tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Welt zu markieren">
5 <column label="Objektname" name="object_name" /> 5 <column label="Objektname" name="object_name" />
6 <column label="Besitzer" name="owner_name" /> 6 <column label="Besitzer" name="owner_name" />
7 <column label="Ersteller" name="creator_name" /> 7 <column label="Ersteller" name="creator_name" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index ea822e4..fb40e39 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -37,8 +37,21 @@
37 Freund hinzufügen 37 Freund hinzufügen
38 </string> 38 </string>
39 <flyout_button label="Profil..." name="profile_callee_btn"/> 39 <flyout_button label="Profil..." name="profile_callee_btn"/>
40 <flyout_button_item name="history_entry">
41 Verlauf anzeigen
42 </flyout_button_item>
43 <flyout_button_item name="pay_entry">
44 Bezahlen
45 </flyout_button_item>
46 <flyout_button_name="teleport_entry">
47 Teleport anbieten
48 </flyout_button_item>
49 </flyout_button>
40 <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/> 50 <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
41 <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/> 51 <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
52 <text name="inventory_send">
53 Inventar hier hereinziehen (Drag & Drop), um es zu senden
54 </text>
42 <panel left_delta="111" name="speaker_controls"> 55 <panel left_delta="111" name="speaker_controls">
43 <button label="" name="mute_btn" tool_tip="Voice stummschalten"/> 56 <button label="" name="mute_btn" tool_tip="Voice stummschalten"/>
44 </panel> 57 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
index 9407e94..a3ad922 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
@@ -1,57 +1,43 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater label="(unbekannt)" name="im_floater" title="(unbekannt)"> 2<floater label="(unbekannt)" name="im_floater" title="(unbekannt)">
3 <layout_stack name="panels"> 3 <string name="ringing">
4 <layout_panel name="im_contents_panel"> 4 Voice-Chat wird beigetreten...
5 <button label="Anrufen" name="start_call_btn" width="145" /> 5 </string>
6 <button label="Anruf beenden" name="end_call_btn" width="145"/> 6 <string name="connected">
7 <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/> 7 Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen
8 <line_editor label="Für Instant Message hier klicken" name="chat_editor"/> 8 </string>
9 <button label="Senden" name="send_btn"/> 9 <string name="hang_up">
10 </layout_panel> 10 Voice-Chat verlassen
11 <layout_panel name="active_speakers_panel"> 11 </string>
12 <scroll_list name="speakers_list"> 12 <string name="voice_icon">
13 <column label="Name" name="speaker_name"/> 13 icn_voice-groupfocus.tga
14 </scroll_list> 14 </string>
15 <panel name="volume_container"> 15 <string name="title_string">
16 <text name="resident_name"> 16 Instant Message an [NAME]
17 Rumpelstilzchen Megakrass 17 </string>
18 </text> 18 <string name="typing_start_string">
19 <text name="Mute:"> 19 [NAME] tippt...
20 Stummschalten: 20 </string>
21 </text> 21 <string name="session_start_string">
22 <check_box label="Text" name="mute_text_btn"/> 22 Beginne Sitzung mit [NAME], bitte warten.
23 <check_box label="Sprache" name="mute_btn"/> 23 </string>
24 </panel> 24 <string name="default_text_label">
25 </layout_panel> 25 Für Instant Message hier klicken.
26 </layout_stack> 26 </string>
27 <string name="ringing"> 27 <layout_stack name="panels">
28 Voice-Chat wird beigetreten... 28 <layout_panel name="im_contents_panel">
29 </string> 29 <button label="Anrufen" name="start_call_btn" width="145" />
30 <string name="connected"> 30 <button label="Anruf beenden" name="end_call_btn" width="145"/>
31 Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen 31 <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier, um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
32 </string> 32 <line_editor label="Für Instant Message hier klicken" name="chat_editor"/>
33 <string name="hang_up"> 33 <button label="Senden" name="send_btn"/>
34 Voice-Chat verlassen 34 </layout_panel>
35 </string> 35 <layout_panel name="active_speakers_panel" />
36 <string name="voice_icon"> 36 </layout_stack>
37 icn_voice-groupfocus.tga 37 <string name="live_help_dialog">
38 </string> 38 *** Willkommen bei Help Request ***
39 <string name="default_text_label"> 39Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
40 Für Instant Message hier klicken. 40Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfügbarer Helfer antwortet.
41 </string> 41-=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
42 <text name="live_help_dialog"> 42 </string>
43 *** Willkommen bei Help Request *** 43</floater>
44Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
45Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfügbarer Helfer antwortet.
46-=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
47 </text>
48 <text name="title_string">
49 Instant Message an [NAME]
50 </text>
51 <text name="typing_start_string">
52 [NAME] tippt...
53 </text>
54 <text name="session_start_string">
55 Beginne Sitzung mit [NAME], bitte warten.
56 </text>
57</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index c7e5542..04a8b08 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
@@ -1,79 +1,68 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater label="(unbekannt)" name="im_floater" title="(unbekannt)" min_width="426" > 2<floater label="(unbekannt)" name="im_floater" title="(unbekannt)" min_width="426" >
3 <layout_stack name="panels"> 3 <string name="ringing">
4 <layout_panel name="im_contents_panel"> 4 Voice-Chat wird beigetreten...
5 <button label="Gruppeninfo" name="group_info_btn" width="85"/> 5 </string>
6 <button label="Gespräch beitreten" left_delta="90" name="start_call_btn" width="145"/> 6 <string name="connected">
7 <button halign="center" label="Anruf beenden" name="end_call_btn" width="145"/> 7 Verbunden. Klicken Sie auf „Anruf beenden“, um die Verbindung zu trennen
8 <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/> 8 </string>
9 <line_editor label="Für Instant Message hier klicken" name="chat_editor"/> 9 <string name="hang_up">
10 <button label="Senden" name="send_btn"/> 10 Voice-Chat verlassen
11 <text name="live_help_dialog"> 11 </string>
12 *** Willkommen bei Help Request *** 12 <string name="voice_icon">
13 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 13 icn_voice-groupfocus.tga
14 Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfügbarer Helfer antwortet. 14 </string>
15 -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=- 15 <string name="live_help_dialog">
16 </text> 16 *** Willkommen bei Help Request ***
17 <text name="title_string"> 17 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
18 Instant Message an [NAME] 18 Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis die verfügbaren Helfer antworten.
19 </text> 19 -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
20 <text name="typing_start_string"> 20 </string>
21 [NAME] tippt... 21 <string name="title_string">
22 </text> 22 Instant Message an [NAME]
23 <text name="session_start_string"> 23 </string>
24 Beginne Sitzung mit [NAME], bitte warten. 24 <string name="typing_start_string">
25 </text> 25 [NAME] tippt...
26 </layout_panel> 26 </string>
27 <layout_panel name="active_speakers_panel"> 27 <string name="session_start_string">
28 <scroll_list name="speakers_list"> 28 Beginne Sitzung mit [NAME], bitte warten.
29 <column label="Name" name="speaker_name"/> 29 </string>
30 </scroll_list> 30 <string name="moderated_chat_label">
31 <panel name="volume_container"> 31 (Moderiert: Voice-Chat standardmäßig abschaltet)
32 <text name="resident_name"> 32 </string>
33 Rumpelstilzchen Megakrass 33 <string name="default_text_label">
34 </text> 34 Für Instant Message hier klicken.
35 <text name="Mute:"> 35 </string>
36 Stummschalten: 36 <string name="muted_text_label">
37 </text> 37 Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.
38 <check_box label="Text" name="mute_text_btn"/> 38 </string>
39 <check_box label="Sprache" name="mute_btn"/> 39 <layout_stack name="panels">
40 </panel> 40 <layout_panel name="im_contents_panel">
41 </layout_panel> 41 <flyout_button label="Gruppeninfo" name="group_info_btn" width="85"/>
42 </layout_stack> 42 <flyout_button_item name="history_entry">
43 <string name="ringing"> 43 Verlauf anzeigen
44 Voice-Chat wird beigetreten... 44 </flyout_button_item>
45 </string> 45 </flyout_button>
46 <string name="connected"> 46 <button label="Gespräch beitreten" left_delta="90" name="start_call_btn" width="145"/>
47 Verbunden. Klicken Sie auf „Anruf beenden“, um die Verbindung zu trennen 47 <button halign="center" label="Anruf beenden" name="end_call_btn" width="145"/>
48 </string> 48 <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier, um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
49 <string name="hang_up"> 49 <line_editor label="Für Instant Message hier klicken" name="chat_editor"/>
50 Voice-Chat verlassen 50 <button label="Senden" name="send_btn"/>
51 </string> 51 </layout_panel>
52 <string name="voice_icon"> 52 <layout_panel name="active_speakers_panel">
53 icn_voice-groupfocus.tga 53 <scroll_list name="speakers_list">
54 </string> 54 <column label="Name" name="speaker_name"/>
55 <string name="live_help_dialog"> 55 </scroll_list>
56 *** Willkommen bei Help Request *** 56 <panel name="volume_container">
57 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 57 <text name="resident_name">
58 Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis die verfügbaren Helfer antworten. 58 Rumpelstilzchen Megakrass
59 -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=- 59 </text>
60 </string> 60 <text name="Mute:">
61 <string name="title_string"> 61 Stummschalten:
62 Instant Message an [NAME] 62 </text>
63 </string> 63 <check_box label="Text" name="mute_text_btn"/>
64 <string name="typing_start_string"> 64 <check_box label="Sprache" name="mute_btn"/>
65 [NAME] tippt... 65 </panel>
66 </string> 66 </layout_panel>
67 <string name="session_start_string"> 67 </layout_stack>
68 Beginne Sitzung mit [NAME], bitte warten. 68</floater>
69 </string>
70 <string name="moderated_chat_label">
71 (Moderiert: Voice-Chat standardmäßig abschaltet)
72 </string>
73 <string name="default_text_label">
74 Für Instant Message hier klicken.
75 </string>
76 <string name="muted_text_label">
77 Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.
78 </string>
79</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
index c8c6724..50d6f13 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
@@ -1,10 +1,52 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Inventory" title="Inventar"> 2<floater name="Inventory" title="Inventar">
3 <search_editor label="Suchanfrage hier eintippen" name="inventory search editor" /> 3 <search_editor label="Suchanfrage hier eingeben" name="inventory search editor" />
4
5 <text name="group_titles_textbox">
6 Schnellfilter:
7 </text>
8
9 <!-- Inventory Type Filter Labels -->
10 <string name="filter_type_all">Alle Arten</string>
11 <string name="filter_type_animation">Animationen</string>
12 <string name="filter_type_bodypart">Körperteile</string>
13 <string name="filter_type_callingcard">Visitenkarten</string>
14 <string name="filter_type_clothing">Kleidung</string>
15 <string name="filter_type_gesture">Gesten</string>
16 <string name="filter_type_landmark">Landmarken</string>
17 <string name="filter_type_notecard">Notizkarten</string>
18 <string name="filter_type_object">Objekte</string>
19 <string name="filter_type_script">Skripte</string>
20 <string name="filter_type_sound">Klänge</string>
21 <string name="filter_type_texture">Texturen</string>
22 <string name="filter_type_snapshot">Fotos</string>
23 <string name="filter_type_custom">Anpassen...</string>
24
25 <combo_box name="Quick Filter" label="Schnellfilter">
26 <combo_item name="filter_type_all">Alle Arten</combo_item>
27 <separator />
28 <combo_item name="filter_type_animation">Animationen</combo_item>
29 <combo_item name="filter_type_bodypart">Körperteile</combo_item>
30 <combo_item name="filter_type_callingcard">Visitenkarten</combo_item>
31 <combo_item name="filter_type_clothing">Kleidung</combo_item>
32 <combo_item name="filter_type_gesture">Gesten</combo_item>
33 <combo_item name="filter_type_landmark">Landmarken</combo_item>
34 <combo_item name="filter_type_notecard">Notizkarten</combo_item>
35 <combo_item name="filter_type_object">Objekte</combo_item>
36 <combo_item name="filter_type_script">Skripte</combo_item>
37 <combo_item name="filter_type_sound">Klänge</combo_item>
38 <combo_item name="filter_type_texture">Texturen</combo_item>
39 <combo_item name="filter_type_snapshot">Fotos</combo_item>
40 <separator />
41 <combo_item name="filter_type_custom">Anpassen...</combo_item>
42 </combo_box>
43
4 <tab_container name="inventory filter tabs"> 44 <tab_container name="inventory filter tabs">
5 <inventory_panel label="Alle Objekte" name="All Items" /> 45 <inventory_panel label="Alle Artikel" name="All Items" />
6 <inventory_panel label="Letzte Objekte" name="Recent Items" /> 46 <inventory_panel label="Letzte Artikel" name="Recent Items" />
47 <inventory_panel label="Getragene Artikel" name="Worn Items" />
7 </tab_container> 48 </tab_container>
49
8 <menu_bar name="Inventory Menu"> 50 <menu_bar name="Inventory Menu">
9 <menu label="Datei" name="File"> 51 <menu label="Datei" name="File">
10 <menu_item_call label="Öffnen" name="Open" /> 52 <menu_item_call label="Öffnen" name="Open" />
@@ -12,14 +54,14 @@
12 <menu_item_call label="Filter anzeigen" name="Show Filters" /> 54 <menu_item_call label="Filter anzeigen" name="Show Filters" />
13 <menu_item_call label="Filter zurücksetzen" name="Reset Current" /> 55 <menu_item_call label="Filter zurücksetzen" name="Reset Current" />
14 <menu_item_call label="Alle Ordner schließen" name="Close All Folders" /> 56 <menu_item_call label="Alle Ordner schließen" name="Close All Folders" />
15 <menu_item_call label="Papierkorb ausleeren" name="Empty Trash" /> 57 <menu_item_call label="Papierkorb leeren" name="Empty Trash" />
16 </menu> 58 </menu>
17 <menu label="Erstellen" name="Create"> 59 <menu label="Erstellen" name="Create">
18 <menu_item_call label="Neuer Ordner" name="New Folder" /> 60 <menu_item_call label="Neuer Ordner" name="New Folder" />
19 <menu_item_call label="Neues Skript" name="New Script" /> 61 <menu_item_call label="Neues Skript" name="New Script" />
20 <menu_item_call label="Neue Notiz" name="New Note" /> 62 <menu_item_call label="Neue Notiz" name="New Note" />
21 <menu_item_call label="Neue Geste" name="New Gesture" /> 63 <menu_item_call label="Neue Geste" name="New Gesture" />
22 <menu name="New Clothes"> 64 <menu label="Neue Kleidung" name="New Clothes">
23 <menu_item_call label="Neues Hemd" name="New Shirt" /> 65 <menu_item_call label="Neues Hemd" name="New Shirt" />
24 <menu_item_call label="Neue Hose" name="New Pants" /> 66 <menu_item_call label="Neue Hose" name="New Pants" />
25 <menu_item_call label="Neue Schuhe" name="New Shoes" /> 67 <menu_item_call label="Neue Schuhe" name="New Shoes" />
@@ -29,8 +71,10 @@
29 <menu_item_call label="Neue Handschuhe" name="New Gloves" /> 71 <menu_item_call label="Neue Handschuhe" name="New Gloves" />
30 <menu_item_call label="Neues Unterhemd" name="New Undershirt" /> 72 <menu_item_call label="Neues Unterhemd" name="New Undershirt" />
31 <menu_item_call label="Neue Unterhose" name="New Underpants" /> 73 <menu_item_call label="Neue Unterhose" name="New Underpants" />
74 <menu_item_call label="Neue Tätowierung" name="New Tattoo" />
75 <menu_item_call label="Neue Transparenz" name="New Alpha" />
32 </menu> 76 </menu>
33 <menu name="New Body Parts"> 77 <menu label="Neues Körperteil" name="New Body Parts">
34 <menu_item_call label="Neue Form/Gestalt" name="New Shape" /> 78 <menu_item_call label="Neue Form/Gestalt" name="New Shape" />
35 <menu_item_call label="Neue Haut" name="New Skin" /> 79 <menu_item_call label="Neue Haut" name="New Skin" />
36 <menu_item_call label="Neues Haar" name="New Hair" /> 80 <menu_item_call label="Neues Haar" name="New Hair" />
@@ -43,5 +87,12 @@
43 <menu_item_check label="Ordner immer nach Name" name="Folders Always By Name" /> 87 <menu_item_check label="Ordner immer nach Name" name="Folders Always By Name" />
44 <menu_item_check label="Systemordner nach oben" name="System Folders To Top" /> 88 <menu_item_check label="Systemordner nach oben" name="System Folders To Top" />
45 </menu> 89 </menu>
90 <menu label="Suchen" name="Search">
91 <menu_item_check label="Nach Name" name="By Name" />
92 <menu_item_check label="Nach Ersteller" name="By Creator" />
93 <menu_item_check label="Nach Beschreibung" name="By Description" />
94 <menu_item_check label="Nach Allem" name="By All" />
95 </menu>
96
46 </menu_bar> 97 </menu_bar>
47</floater> 98</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 0028f1d..7219ce6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -56,7 +56,7 @@
56 <check_box label="Kopieren" name="CheckNextOwnerCopy" left_delta="85" /> 56 <check_box label="Kopieren" name="CheckNextOwnerCopy" left_delta="85" />
57 <check_box label="Verkaufen/Weggeben" name="CheckNextOwnerTransfer" /> 57 <check_box label="Verkaufen/Weggeben" name="CheckNextOwnerTransfer" />
58 <text name="SaleLabel"> 58 <text name="SaleLabel">
59 Objekt markieren: 59 Artikel markieren:
60 </text> 60 </text>
61 <check_box label="Zum Verkauf" name="CheckPurchase" /> 61 <check_box label="Zum Verkauf" name="CheckPurchase" />
62 <radio_group name="RadioSaleType" left_delta="85" width="245" > 62 <radio_group name="RadioSaleType" left_delta="85" width="245" >
@@ -64,11 +64,11 @@
64 Original 64 Original
65 </radio_item> 65 </radio_item>
66 <radio_item name="radio2"> 66 <radio_item name="radio2">
67 Kopieren 67 Kopie
68 </radio_item> 68 </radio_item>
69 </radio_group> 69 </radio_group>
70 <text name="TextPrice"> 70 <text name="TextPrice">
71 Preis: L$ 71 Preis: [CURRENCY]
72 </text> 72 </text>
73 <text name="unknown"> 73 <text name="unknown">
74 (unbekannt) 74 (unbekannt)
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index aa24231..6ec5a08 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -1,16 +1,18 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Inventory Finder" title="inventar_letzte_objekte"> 2<floater name="Inventory Finder" title="inventar_letzte_artikel">
3 <check_box label="Animation" name="check_animation" /> 3 <check_box label="Animation" name="check_animation" />
4 <check_box label="Körperteile" name="check_bodypart" />
4 <check_box label="Visitenkarten" name="check_calling_card" /> 5 <check_box label="Visitenkarten" name="check_calling_card" />
5 <check_box label="Kleidung" name="check_clothing" /> 6 <check_box label="Kleidung" name="check_clothing" />
6 <check_box label="Gesten" name="check_gesture" /> 7 <check_box label="Gesten" name="check_gesture" />
7 <check_box label="Landmarken" name="check_landmark" /> 8 <check_box label="Landmarken" name="check_landmark" />
8 <check_box label="Notizkarten" name="check_notecard" /> 9 <check_box label="Notizkarten" name="check_notecard" />
9 <check_box label="Objekte" name="check_object" /> 10 <check_box label="Objekte" name="check_object" />
10 <check_box label="Skripts" name="check_script" /> 11 <check_box label="Skripte" name="check_script" />
11 <check_box label="Sounds" name="check_sound" /> 12 <check_box label="Klänge" name="check_sound" />
12 <check_box label="Texturen" name="check_texture" /> 13 <check_box label="Texturen" name="check_texture" />
13 <check_box label="Fotos" name="check_snapshot" /> 14 <check_box label="Fotos" name="check_snapshot" />
15
14 <button label="Alle" label_selected="Alle" name="All" /> 16 <button label="Alle" label_selected="Alle" name="All" />
15 <button label="Keine" label_selected="Keine" name="None" /> 17 <button label="Keine" label_selected="Keine" name="None" />
16 <check_box label="Ordner immer anzeigen" name="check_show_empty" /> 18 <check_box label="Ordner immer anzeigen" name="check_show_empty" />
@@ -18,7 +20,9 @@
18 <text type="string" length="1" name="- OR -"> 20 <text type="string" length="1" name="- OR -">
19 - ODER - 21 - ODER -
20 </text> 22 </text>
23
21 <spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago" /> 24 <spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago" />
22 <spinner label="Tage zuvor" name="spin_days_ago" /> 25 <spinner label="Tage zuvor" name="spin_days_ago" />
26
23 <button label="Schließen" label_selected="Schließen" name="Close" /> 27 <button label="Schließen" label_selected="Schließen" name="Close" />
24</floater> 28</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_joystick.xml b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
index 2759115..cd1a465 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
@@ -1,86 +1,92 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Joystick" title="Joystick-Konfiguration"> 2<floater name="Joystick" title="Joystick-Konfiguration">
3 <check_box name="enable_joystick" width="80"> 3 <check_box name="enable_joystick" width="80">
4 Joystick aktivieren: 4 Joystick aktivieren:
5 </check_box> 5 </check_box>
6 <text left="140" name="joystick_type" width="360"/> 6 <text left="140" name="joystick_type" width="360"/>
7 <spinner label="X-Achse" name="JoystickAxis1"/> 7
8 <spinner label="Y-Achse" name="JoystickAxis2"/> 8 <check_box name="auto_enable_joystick">Joystick Autom. aktivieren</check_box>
9 <spinner label="Z-Achse" name="JoystickAxis0"/> 9 <spinner label="X-Achse" name="JoystickAxis1"/>
10 <spinner label="Neigungswinkel" name="JoystickAxis4"/> 10 <spinner label="Y-Achse" name="JoystickAxis2"/>
11 <spinner label="Gierwinkel" name="JoystickAxis5"/> 11 <spinner label="Z-Achse" name="JoystickAxis0"/>
12 <spinner label="Rollwinkel" name="JoystickAxis3"/> 12 <spinner label="Neigungswinkel" name="JoystickAxis4"/>
13 <spinner label="Zoom" name="JoystickAxis6"/> 13 <spinner label="Gierwinkel" name="JoystickAxis5"/>
14 <check_box label="Direkt-Zoom" name="ZoomDirect"/> 14 <spinner label="Rollwinkel" name="JoystickAxis3"/>
15 <check_box label="3D-Cursor" left="300" name="Cursor3D"/> 15 <spinner label="Zoom" name="JoystickAxis6"/>
16 <check_box label="Automatisch ausrichten" left="390" name="AutoLeveling"/> 16 <check_box label="Direkt-Zoom" name="ZoomDirect"/>
17 <text name="Control Modes:"> 17 <check_box label="3D-Cursor" left="300" name="Cursor3D"/>
18 Steuermodi: 18 <check_box label="Automatisch ausrichten" left="390" name="AutoLeveling"/>
19 </text> 19
20 <check_box name="JoystickAvatarEnabled"> 20 <text name="Control Modes:">
21 Avatar 21 Steuermodi:
22 </check_box> 22 </text>
23 <check_box name="JoystickBuildEnabled"> 23
24 Bauen 24 <check_box name="JoystickAvatarEnabled">
25 </check_box> 25 Avatar
26 <check_box name="JoystickFlycamEnabled"> 26 </check_box>
27 Flycam 27 <check_box name="JoystickBuildEnabled">
28 </check_box> 28 Bauen
29 <text name="XScale"> 29 </check_box>
30 X-Skala 30 <check_box name="JoystickFlycamEnabled">
31 </text> 31 Flycam
32 <text name="YScale"> 32 </check_box>
33 Y-Skala 33
34 </text> 34 <text name="XScale">
35 <text name="ZScale"> 35 X-Skala
36 Z-Skala 36 </text>
37 </text> 37 <text name="YScale">
38 <text name="PitchScale"> 38 Y-Skala
39 Neigungsskala 39 </text>
40 </text> 40 <text name="ZScale">
41 <text name="YawScale"> 41 Z-Skala
42 Gierskala 42 </text>
43 </text> 43 <text name="PitchScale">
44 <text name="RollScale"> 44 Neigungsskala
45 Rollskala 45 </text>
46 </text> 46 <text name="YawScale">
47 <text name="XDeadZone"> 47 Gierskala
48 X-Totzone 48 </text>
49 </text> 49 <text name="RollScale">
50 <text name="YDeadZone"> 50 Rollskala
51 Y-Totzone 51 </text>
52 </text> 52 <text name="XDeadZone">
53 <text name="ZDeadZone"> 53 X-Totzone
54 Z-Totzone 54 </text>
55 </text> 55 <text name="YDeadZone">
56 <text name="PitchDeadZone"> 56 Y-Totzone
57 Neigen-Totzone 57 </text>
58 </text> 58 <text name="ZDeadZone">
59 <text name="YawDeadZone"> 59 Z-Totzone
60 Gieren-Totzone 60 </text>
61 </text> 61 <text name="PitchDeadZone">
62 <text name="RollDeadZone"> 62 Neigen-Totzone
63 Rollen-Totzone 63 </text>
64 </text> 64 <text name="YawDeadZone">
65 <text name="Feathering"> 65 Gieren-Totzone
66 Auslaufen 66 </text>
67 </text> 67 <text name="RollDeadZone">
68 <text name="ZoomScale2"> 68 Rollen-Totzone
69 Zoom-Skala 69 </text>
70 </text> 70 <text name="Feathering">
71 <text name="ZoomDeadZone"> 71 Auslaufen
72 Zoom-Totzone 72 </text>
73 </text> 73 <text name="ZoomScale2">
74 <button label="SpaceNavigator-Standards" name="SpaceNavigatorDefaults"/> 74 Zoom-Skala
75 <button label="OK" label_selected="OK" name="ok_btn"/> 75 </text>
76 <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/> 76 <text name="ZoomDeadZone">
77 <string name="JoystickMonitor"> 77 Zoom-Totzone
78 Joystick-Monitor 78 </text>
79 </string> 79
80 <string name="Axis"> 80 <button label="SpaceNavigator-Standards" name="SpaceNavigatorDefaults"/>
81 Achse [NUM] 81 <button label="OK" label_selected="OK" name="ok_btn"/>
82 </string> 82 <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
83 <string name="NoDevice"> 83 <string name="JoystickMonitor">
84 Kein Gerät erkannt 84 Joystick-Monitor
85 </string> 85 </string>
86</floater> 86 <string name="Axis">
87 Achse [NUM]
88 </string>
89 <string name="NoDevice">
90 Kein Gerät erkannt
91 </string>
92</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
index ee70387..9ce4b54 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
@@ -133,7 +133,7 @@
133 bottom="-146" drop_shadow_visible="true" follows="left|top" 133 bottom="-146" drop_shadow_visible="true" follows="left|top"
134 font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108" 134 font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
135 mouse_opaque="true" name="land cost text" v_pad="0" width="110"> 135 mouse_opaque="true" name="land cost text" v_pad="0" width="110">
136 L$ per sq. meter: 136 [CURRENCY] per sq. meter:
137 </text> 137 </text>
138 <button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center" 138 <button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center"
139 height="20" label="Refresh" label_selected="Refresh" left="278" 139 height="20" label="Refresh" label_selected="Refresh" left="278"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
deleted file mode 100644
index 282a2f5..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
+++ /dev/null
@@ -1,657 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="360" min_height="100" min_width="100"
4 name="groupinfo" title="The Lindens - Group Information" width="458">
5 <tab_container bottom="-330" height="306" left="0" mouse_opaque="false" name="tab"
6 tab_position="top" width="458">
7 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="General"
8 left="1" mouse_opaque="true" name="gen" width="456">
9 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
10 bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
11 h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
12 name="title_box" v_pad="0" width="436">
13 Group Info
14 </text>
15 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
16 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
17 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
18 mouse_opaque="true" name="txt" v_pad="0" width="436">
19 Groups are a fun way to collaborate with your friends.
20 </text>
21 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
22 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
23 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
24 mouse_opaque="true" name="txt2" v_pad="0" width="436">
25 Groups let you have titles and insignia and vote.
26 </text>
27 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
28 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
29 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
30 mouse_opaque="true" name="txt3" v_pad="0" width="436">
31 Anyone may create a group. Each person may belong to up to 15 groups.
32 </text>
33 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
34 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
35 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
36 mouse_opaque="true" name="txt4" v_pad="0" width="436">
37 Groups must have at least 3 members to stay active.
38 </text>
39 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
40 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
41 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
42 mouse_opaque="true" name="group_create_text" v_pad="0" width="436">
43 Creating a group costs L$100.
44 </text>
45 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
46 bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
47 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
48 mouse_opaque="true" name="lbl" v_pad="0" width="70">
49 Name:
50 </text>
51 <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
52 border_thickness="1" bottom="-138" follows="left|top" font="SansSerifSmall"
53 height="16" left_delta="75" max_length="35" mouse_opaque="true" name="name"
54 text_readonly_color="1, 1, 1, 1" width="361" />
55 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
56 bottom="-156" drop_shadow_visible="true" follows="left|top"
57 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
58 mouse_opaque="true" name="founder_label" v_pad="0" width="70">
59 Founder:
60 </text>
61 <name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
62 border_thickness="1" bottom="-156" follows="left|top" font="SansSerifSmall"
63 height="16" left_delta="75" max_length="35" mouse_opaque="true"
64 name="founder" text_readonly_color="1, 1, 1, 1" width="361" />
65 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
66 bottom="-174" drop_shadow_visible="true" follows="left|top"
67 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
68 mouse_opaque="true" name="lbl2" v_pad="0" width="70">
69 Charter:
70 </text>
71 <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-206" embedded_items="false"
72 follows="left|top" font="SansSerifSmall" height="48" left="87"
73 max_length="511" mouse_opaque="true" name="charter"
74 text_readonly_color="1, 1, 1, 1" width="361" word_wrap="true" spell_check="true" />
75 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
76 initial_value="true" label="Show In Group List" left="87"
77 mouse_opaque="true" name="sho" radio_style="false" width="361" />
78 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
79 initial_value="false" label="Show Members In Group List" left="87"
80 mouse_opaque="true" name="sho_mem" radio_style="false" width="361" />
81 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
82 initial_value="false" label="Publish on the web." left="87"
83 mouse_opaque="true" name="allow_publish" radio_style="false"
84 tool_tip="Publish your profile information on the web." width="361" />
85 <button bottom="-260" follows="left|top" font="SansSerif" halign="center" height="16"
86 label="?" label_selected="?" left_delta="130" mouse_opaque="true"
87 name="publish_help_btn" width="20" />
88 <check_box bottom="-278" follows="left|top" font="SansSerifSmall" height="16"
89 initial_value="false" label="Mature" left="87" mouse_opaque="true"
90 name="mature" radio_style="false"
91 tool_tip="Your profile information is considered mature." width="361" />
92 </panel>
93 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Titles"
94 left="1" mouse_opaque="true" name="tit" width="456">
95 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
96 bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
97 h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
98 name="txt" v_pad="0" width="436">
99 Group Titles
100 </text>
101 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
102 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
103 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
104 mouse_opaque="true" name="txt2" v_pad="0" width="436">
105 Groups can have officers and members, both of whom can have special titles.
106 </text>
107 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
108 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
109 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
110 mouse_opaque="true" name="txt3" v_pad="0" width="436">
111 These titles appear before their names in the world, in chat, and in IM.
112 </text>
113 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
114 bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
115 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
116 mouse_opaque="true" name="lbl" v_pad="0" width="70">
117 Officer Title:
118 </text>
119 <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
120 border_thickness="1" bottom="-90" follows="left|top" font="SansSerifSmall"
121 height="16" left_delta="75" max_length="20" mouse_opaque="true" name="ohon"
122 text_readonly_color="1, 1, 1, 1" width="105" spell_check="true" />
123 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
124 bottom="-90" drop_shadow_visible="true" follows="left|top"
125 font="SansSerifSmall" h_pad="0" halign="right" height="16" left_delta="110"
126 mouse_opaque="true" name="lbl2" v_pad="0" width="70">
127 Member Title:
128 </text>
129 <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
130 border_thickness="1" bottom="-90" follows="left|top" font="SansSerifSmall"
131 height="16" left_delta="75" max_length="20" mouse_opaque="true" name="mhon"
132 text_readonly_color="1, 1, 1, 1" width="105" spell_check="true" />
133 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
134 bottom="-124" drop_shadow_visible="true" follows="left|top"
135 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
136 mouse_opaque="true" name="lbl3" v_pad="0" width="436">
137 Drag a texture out of your inventory to set the group&apos;s insignia.
138 </text>
139 <texture_picker bottom="-220" follows="left|top" height="80" left="87" mouse_opaque="true"
140 name="insig" tool_tip="Click to choose a picture" width="64" />
141 </panel>
142 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Members"
143 left="1" mouse_opaque="true" name="mem" width="456">
144 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
145 bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
146 h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
147 name="txt" v_pad="0" width="436">
148 Group Members
149 </text>
150 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
151 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
152 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
153 mouse_opaque="true" name="txt2" v_pad="0" width="436">
154 Current Group officers and members.
155 </text>
156 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
157 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
158 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
159 mouse_opaque="true" name="txt3" v_pad="0" width="436">
160 Click on a name to view to the member&apos;s profile.
161 </text>
162 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
163 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
164 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
165 mouse_opaque="true" name="lbl" v_pad="0" width="70">
166 Officers:
167 </text>
168 <name_list allow_calling_card_drop="false" background_visible="false"
169 bg_selected_color="0.243137, 0.243137, 0.243137, 1" bottom="-132"
170 column_padding="0" draw_border="true" fg_disable_color="1, 1, 1, 1"
171 fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
172 follows="left|top" height="72" left="87" mouse_opaque="true"
173 multi_select="false" name="officers" width="361" />
174 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
175 bottom="-150" drop_shadow_visible="true" follows="left|top"
176 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
177 mouse_opaque="true" name="members_label" v_pad="0" width="70">
178 Members:
179 </text>
180 <name_list allow_calling_card_drop="false" background_visible="false" bottom="-254"
181 column_padding="0" draw_border="true" fg_disable_color="1, 1, 1, 1"
182 fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
183 follows="left|top" height="120" left="87" mouse_opaque="true"
184 multi_select="false" name="members" width="361" />
185 <button bottom_delta="-27" follows="left|bottom" font="SansSerif" halign="center"
186 height="20" label="Eject Member" label_selected="Eject Member" left="87"
187 mouse_opaque="true" name="eject_member_btn" width="120" />
188 </panel>
189 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Voting"
190 left="1" mouse_opaque="true" name="voting" width="456">
191 <tab_container bottom="-289" height="285" left="30" mouse_opaque="false" name="tab"
192 tab_position="top" width="400">
193 <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Election"
194 left="1" mouse_opaque="true" name="recall" width="398">
195 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
196 bottom="-18" drop_shadow_visible="true" follows="left|top" font="SansSerif"
197 h_pad="0" halign="left" height="10" left="12" mouse_opaque="false"
198 name="txt" v_pad="0" width="363">
199 Group Election
200 </text>
201 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
202 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
203 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
204 mouse_opaque="false" name="instructions" v_pad="0" width="350">
205 Press the Start Election button to start a new election.
206The candidates will include all non-officer group members.
207 </text>
208 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
209 bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
210 font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
211 mouse_opaque="false" name="lbl" v_pad="0" width="70">
212 Candidates:
213 </text>
214 <name_list allow_calling_card_drop="false" background_visible="false"
215 bg_selected_color="0.243137, 0.243137, 0.243137, 1" bottom="-150"
216 column_padding="0" draw_border="true" fg_disable_color="1, 1, 1, 1"
217 fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
218 follows="left|top" height="94" left="87" mouse_opaque="true"
219 multi_select="false" name="candidates" width="290" />
220 <button bottom_delta="-116" follows="top" font="SansSerif" halign="center" height="20"
221 label="Vote" label_selected="Vote" left="87" mouse_opaque="true"
222 name="btn_vote" width="60" />
223 <button bottom="-266" follows="left|top" font="SansSerif" halign="center" height="20"
224 label="Abstain" label_selected="Abstain" left_delta="68"
225 mouse_opaque="true" name="btn_abstain" width="60" />
226 <button bottom="-260" follows="top|right" font="SansSerif" halign="center" height="20"
227 label="Start Election" label_selected="Start Election" left="218"
228 mouse_opaque="true" name="btn_start_election" width="160" />
229 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
230 bottom="-172" drop_shadow_visible="true" follows="left|top"
231 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
232 mouse_opaque="false" name="lbl2" v_pad="0" width="70">
233 Quorum:
234 </text>
235 <spinner bottom="-172" decimal_digits="0" follows="left|top" height="20" increment="1"
236 initial_val="1" left_delta="75" max_val="111" min_val="1"
237 mouse_opaque="true" name="quorum"
238 tool_tip="# of total voting members needed for election results to be binding."
239 width="40" />
240 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
241 bottom="-172" drop_shadow_visible="true" follows="left|top"
242 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
243 mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
244 out of 111 total group members.
245 </text>
246 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
247 bottom="-196" drop_shadow_visible="true" follows="left|top"
248 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
249 mouse_opaque="false" name="lbl3" v_pad="0" width="65">
250 Majority:
251 </text>
252 <radio_group bottom="-232" follows="left|top" height="60" left="270" mouse_opaque="true"
253 name="majority" tool_tip="Majority of total votes needed to win."
254 width="105">
255 <radio_item bottom="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
256 name="radio" width="99">
257 Simple Majority
258 </radio_item>
259 <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
260 name="radio2" width="93">
261 2/3 Majority
262 </radio_item>
263 <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
264 name="radio3" width="93">
265 Unanimous
266 </radio_item>
267 </radio_group>
268 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
269 bottom="-203" drop_shadow_visible="true" follows="left|top"
270 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
271 mouse_opaque="false" name="duration_lbl" v_pad="0" width="70">
272 Duration:
273 </text>
274 <spinner bottom="-200" decimal_digits="0" follows="left|top" height="20" increment="1"
275 initial_val="7" left_delta="75" max_val="30" min_val="1"
276 mouse_opaque="true" name="duration"
277 tool_tip="# of days the election will last." width="40" />
278 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
279 bottom="-203" drop_shadow_visible="true" follows="left|top"
280 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
281 mouse_opaque="false" name="duration_days" v_pad="0" width="300">
282 days
283 </text>
284 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
285 bottom="-224" drop_shadow_visible="true" follows="left|top"
286 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
287 mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
288 Election Start:
289 </text>
290 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
291 bottom="-224" drop_shadow_visible="true" follows="left|top"
292 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
293 mouse_opaque="false" name="start_date" v_pad="0" width="200" />
294 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
295 bottom="-242" drop_shadow_visible="true" follows="left|top"
296 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
297 mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
298 Election Ends:
299 </text>
300 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
301 bottom="-242" drop_shadow_visible="true" follows="left|top"
302 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
303 mouse_opaque="false" name="end_date" v_pad="0" width="200" />
304 </panel>
305 <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Proposal"
306 left="1" mouse_opaque="true" name="panel_group_proposals" width="398">
307 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
308 bottom="-18" drop_shadow_visible="true" follows="left|top" font="SansSerif"
309 h_pad="0" halign="left" height="10" left="12" mouse_opaque="false"
310 name="txt" v_pad="0" width="363">
311 Group Proposals
312 </text>
313 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
314 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
315 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
316 mouse_opaque="false" name="instructions" v_pad="0" width="350">
317 There are no active proposals. Press the Create Proposal button to
318create a new proposal.
319 </text>
320 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
321 bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
322 font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
323 mouse_opaque="false" name="proposal_lbl" v_pad="0" width="70">
324 Proposals:
325 </text>
326 <scroll_list background_visible="false" bg_selected_color="0.243137, 0.243137, 0.243137, 1"
327 bottom="-190" column_padding="5" draw_border="true"
328 fg_disable_color="1, 1, 1, 1" fg_selected_color="0, 0, 0, 1"
329 fg_unselected_color="1, 1, 1, 1" follows="left|top" height="134" left="87"
330 mouse_opaque="true" multi_select="false" name="proposals" width="290" />
331 <text_editor bg_readonly_color="0, 0, 0, 0" bg_writeable_color="1, 1, 1, 1"
332 bottom_delta="40" embedded_items="false" follows="left|top"
333 font="SansSerif" height="94" left="87" max_length="255" mouse_opaque="true"
334 name="proposal_text" text_readonly_color="1, 1, 1, 1" width="290"
335 word_wrap="false" spell_check="true" />
336 <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
337 label="Yes" label_selected="Yes" left="87" mouse_opaque="true"
338 name="btn_yes" width="60" />
339 <button bottom="-172" follows="left|top" font="SansSerif" halign="center" height="20"
340 label="No" label_selected="No" left_delta="68" mouse_opaque="true"
341 name="btn_no" width="60" />
342 <button bottom="-172" follows="left|top" font="SansSerif" halign="center" height="20"
343 label="Abstain" label_selected="Abstain" left_delta="68"
344 mouse_opaque="true" name="btn_abstain" width="60" />
345 <button bottom="-172" follows="left|top" font="SansSerif" halign="center" height="20"
346 label="View List" label_selected="View List" left_delta="68"
347 mouse_opaque="true" name="btn_view_list" width="90" />
348 <button bottom_delta="-44" follows="left|top" font="SansSerif" halign="center"
349 height="20" label="View Item" label_selected="View Item" left="291"
350 mouse_opaque="true" name="btn_view_item" width="90" />
351 <button bottom="-216" follows="left|top" font="SansSerif" halign="center" height="20"
352 label="Create Proposal" label_selected="Create Proposal" left_delta="-204"
353 mouse_opaque="true" name="btn_proposal" width="160" />
354 <button bottom_delta="-50" follows="left|top" font="SansSerif" halign="center"
355 height="20" label="Submit" label_selected="Submit" left="87"
356 mouse_opaque="true" name="btn_submit" width="60" />
357 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
358 bottom="-200" drop_shadow_visible="true" follows="left|top"
359 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
360 mouse_opaque="false" name="quorum_lbl" v_pad="0" width="70">
361 Quorum:
362 </text>
363 <spinner bottom="-200" decimal_digits="0" follows="left|top" height="20" increment="1"
364 initial_val="0" left_delta="75" max_val="111" min_val="1"
365 mouse_opaque="true" name="quorum"
366 tool_tip="# of total voting members needed for election results to be binding."
367 width="40" />
368 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
369 bottom="-200" drop_shadow_visible="true" follows="left|top"
370 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
371 mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
372 out of 111 total group members.
373 </text>
374 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
375 bottom="-224" drop_shadow_visible="true" follows="left|top"
376 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
377 mouse_opaque="false" name="majority_lbl" v_pad="0" width="65">
378 Majority:
379 </text>
380 <radio_group bottom="-260" follows="left|top" height="60" left="270" mouse_opaque="true"
381 name="majority" tool_tip="Majority of total votes needed to win."
382 width="105">
383 <radio_item bottom="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
384 name="radio" width="99">
385 Simple Majority
386 </radio_item>
387 <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
388 name="radio2" width="93">
389 2/3 Majority
390 </radio_item>
391 <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
392 name="radio3" width="93">
393 Unanimous
394 </radio_item>
395 </radio_group>
396 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
397 bottom="-227" drop_shadow_visible="true" follows="left|top"
398 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
399 mouse_opaque="false" name="duration_lbl" v_pad="0" width="70">
400 Duration:
401 </text>
402 <spinner bottom="-224" decimal_digits="0" follows="left|top" height="20" increment="1"
403 initial_val="7" left_delta="75" max_val="30" min_val="1"
404 mouse_opaque="true" name="duration"
405 tool_tip="# of days the election will last." width="40" />
406 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
407 bottom="-227" drop_shadow_visible="true" follows="left|top"
408 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
409 mouse_opaque="false" name="duration_text" v_pad="0" width="300">
410 days
411 </text>
412 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
413 bottom="-248" drop_shadow_visible="true" follows="left|top"
414 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
415 mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
416 Voting Start:
417 </text>
418 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
419 bottom="-248" drop_shadow_visible="true" follows="left|top"
420 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
421 mouse_opaque="false" name="start_date" v_pad="0" width="200" />
422 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
423 bottom="-266" drop_shadow_visible="true" follows="left|top"
424 font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
425 mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
426 Voting Ends:
427 </text>
428 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
429 bottom="-266" drop_shadow_visible="true" follows="left|top"
430 font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
431 mouse_opaque="false" name="end_date" v_pad="0" width="200" />
432 </panel>
433 <panel bottom="-284" follows="left|top|right|bottom" height="268" label="History"
434 left="1" mouse_opaque="true" name="History" width="398">
435 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
436 bottom="-18" drop_shadow_visible="true" follows="left|top" font="SansSerif"
437 h_pad="0" halign="left" height="10" left="12" mouse_opaque="false"
438 name="txt" v_pad="0" width="363">
439 Group Voting History
440 </text>
441 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
442 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
443 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
444 mouse_opaque="false" name="instructions" v_pad="0" width="350">
445 You may view past group vote results by selecting the vote and.
446 </text>
447 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
448 bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
449 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
450 mouse_opaque="false" name="instructions2" v_pad="0" width="350">
451 pressing View Item.
452 </text>
453 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
454 bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
455 font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
456 mouse_opaque="false" name="history_list_lbl" v_pad="0" width="70">
457 Past Votes:
458 </text>
459 <scroll_list background_visible="false" bg_selected_color="1, 1, 1, 1" bottom="-230"
460 column_padding="10" draw_border="true" fg_disable_color="1, 1, 1, 1"
461 fg_selected_color="0, 0, 0, 1" fg_unselected_color="1, 1, 1, 1"
462 follows="left|top" height="170" left="87" mouse_opaque="true"
463 multi_select="false" name="history_list" width="300" />
464 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
465 bottom="-68" drop_shadow_visible="true" follows="left|top"
466 font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
467 mouse_opaque="false" name="vote_text_lbl" v_pad="0" width="70">
468 Vote Results:
469 </text>
470 <text_editor bg_readonly_color="0, 0, 0, 0" bg_writeable_color="1, 1, 1, 1" bottom="-230"
471 embedded_items="false" follows="left|top" font="SansSerif" height="170"
472 left="87" max_length="1024" mouse_opaque="true" name="vote_text"
473 text_readonly_color="1, 1, 1, 1" width="300" word_wrap="false" />
474 <button bottom="-260" follows="top" font="SansSerif" halign="center" height="20"
475 label="View List" label_selected="View List" left="291" mouse_opaque="true"
476 name="btn_view_list" width="90" />
477 <button bottom_delta="0" follows="top" font="SansSerif" halign="center" height="20"
478 label="View Item" label_selected="View Item" left_delta="0"
479 mouse_opaque="true" name="btn_view_item" width="90" />
480 </panel>
481 </tab_container>
482 </panel>
483 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Invite"
484 left="1" mouse_opaque="true" name="inv" width="456">
485 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
486 bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
487 h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
488 name="txt" v_pad="0" width="436">
489 Group Invitations
490 </text>
491 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
492 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
493 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
494 mouse_opaque="true" name="txt2" v_pad="0" width="436">
495 Invitations are sent via instant message.
496 </text>
497 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
498 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
499 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
500 mouse_opaque="true" name="txt3" v_pad="0" width="436">
501 Click on the add button to add users to the list.
502 </text>
503 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
504 bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
505 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
506 mouse_opaque="true" name="lbl" v_pad="0" width="70">
507 Officers:
508 </text>
509 <name_list allow_calling_card_drop="true" background_visible="true" bottom="-134"
510 column_padding="5" draw_border="true" follows="top" height="60" left="87"
511 mouse_opaque="true" multi_select="false" name="inv officers" width="290" />
512 <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
513 label="Add Officer..." label_selected="Add Officer..." left="87"
514 mouse_opaque="true" name="add_officer_btn" width="120" />
515 <button bottom="-156" follows="top" font="SansSerif" halign="center" height="20"
516 label="Remove Selected" label_selected="Remove Selected" left_delta="128"
517 mouse_opaque="true" name="remove_officer_btn" width="120" />
518 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
519 bottom="-174" drop_shadow_visible="true" follows="left|top"
520 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
521 mouse_opaque="true" name="lbl2" v_pad="0" width="70">
522 Members:
523 </text>
524 <name_list allow_calling_card_drop="true" background_visible="true" bottom="-218"
525 column_padding="5" draw_border="true" follows="top" height="60" left="87"
526 mouse_opaque="true" multi_select="false" name="inv members" width="290" />
527 <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
528 label="Add Member..." label_selected="Add Member..." left="87"
529 mouse_opaque="true" name="add_member_btn" width="120" />
530 <button bottom="-240" follows="top" font="SansSerif" halign="center" height="20"
531 label="Remove Selected" label_selected="Remove Selected" left_delta="128"
532 mouse_opaque="true" name="remove_member_btn" width="120" />
533 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
534 bottom="-258" drop_shadow_visible="true" follows="left|top"
535 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
536 mouse_opaque="true" name="lbl3" v_pad="0" width="70">
537 Signup Fee:
538 </text>
539 <spinner bottom="-258" decimal_digits="0" follows="left|top" height="16" increment="1"
540 initial_val="0" left_delta="75" max_val="1e+007" min_val="0"
541 mouse_opaque="true" name="fee" width="60" />
542 <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
543 initial_value="false" label="Open enrollment (no invite necessary)"
544 left="87" mouse_opaque="true" name="open" radio_style="false" width="361" />
545 </panel>
546 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Land"
547 left="1" mouse_opaque="true" name="land" width="456">
548 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
549 bottom="-24" drop_shadow_visible="true" follows="left|top"
550 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
551 mouse_opaque="true" name="txt" v_pad="0" width="436">
552 Group Owned Land
553 </text>
554 <scroll_list background_visible="true" bottom_delta="-152" column_padding="5"
555 draw_border="true" follows="top" height="150" left="8" mouse_opaque="true"
556 multi_select="false" name="parcel list" width="440" />
557 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
558 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
559 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
560 mouse_opaque="true" name="lbl" v_pad="0" width="180">
561 Total Contributed Land:
562 </text>
563 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
564 bottom="-210" drop_shadow_visible="true" follows="left|top"
565 font="SansSerifSmall" h_pad="0" halign="left" height="32" left="192"
566 mouse_opaque="true" name="total" v_pad="0" width="75" />
567 <button bottom="-198" follows="top" font="SansSerif" halign="center" height="20"
568 label="Map..." label_selected="Map..." left="380" mouse_opaque="true"
569 name="map_btn" width="60" />
570 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
571 bottom="-216" drop_shadow_visible="true" follows="left|top"
572 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
573 mouse_opaque="true" name="lbl2" v_pad="0" width="180">
574 Total Land In Use:
575 </text>
576 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
577 bottom="-232" drop_shadow_visible="true" follows="left|top"
578 font="SansSerifSmall" h_pad="0" halign="left" height="32" left="192"
579 mouse_opaque="true" name="committed" v_pad="0" width="75" />
580 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
581 bottom="-238" drop_shadow_visible="true" follows="left|top"
582 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
583 mouse_opaque="true" name="lbl3" v_pad="0" width="180">
584 Land Available:
585 </text>
586 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
587 bottom="-254" drop_shadow_visible="true" follows="left|top"
588 font="SansSerifSmall" h_pad="0" halign="left" height="32" left="192"
589 mouse_opaque="true" name="avail" v_pad="0" width="75" />
590 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
591 bottom="-260" drop_shadow_visible="true" follows="left|top"
592 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
593 mouse_opaque="true" name="your_contrib_label" v_pad="0" width="180" />
594 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-260"
595 follows="left|top" font="SansSerifSmall" height="16" left_delta="185"
596 max_length="10" mouse_opaque="true" name="your_contrib" width="60" />
597 <button bottom="-264" follows="top" font="SansSerif" halign="center" height="20"
598 label="Set Contribution" label_selected="Set Contribution" left_delta="103"
599 mouse_opaque="true" name="set_contrib_btn" width="140" />
600 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
601 bottom="-284" drop_shadow_visible="true" follows="left|top"
602 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
603 mouse_opaque="true" name="warning_label" v_pad="0" width="436">
604 WARNING: Group maintains too much land. Group members need to contribute more.
605 </text>
606 </panel>
607 <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Money"
608 left="1" mouse_opaque="true" name="mon" width="456">
609 <tab_container bottom="-289" height="285" left="0" mouse_opaque="false"
610 name="group money history tab" tab_position="top" width="400">
611 <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Planning"
612 left="1" mouse_opaque="true" name="money panel" width="398">
613 <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="-260"
614 embedded_items="false" follows="left|top|right|bottom" font="Monospace"
615 height="252" left="8" max_length="2147483647" mouse_opaque="true"
616 name="money text" width="382" word_wrap="false" />
617 </panel>
618 <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Details"
619 left="1" mouse_opaque="true" name="money panel2" width="398">
620 <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="-232"
621 embedded_items="false" follows="left|top|right|bottom" font="Monospace"
622 height="224" left="8" max_length="2147483647" mouse_opaque="true"
623 name="money text" width="382" word_wrap="false" />
624 <button bottom="-260" follows="left|bottom" font="SansSerif" halign="center"
625 height="20" label="&lt; Earlier" label_selected="&lt; Earlier" left="24"
626 mouse_opaque="true" name="&lt; Earlier" tool_tip="Go back in time"
627 width="80" />
628 <button bottom="-260" follows="right|bottom" font="SansSerif" halign="center"
629 height="20" label="Later &gt;" label_selected="Later &gt;" left_delta="270"
630 mouse_opaque="true" name="Later &gt;" tool_tip="Go forward in time"
631 width="80" />
632 </panel>
633 <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Sales"
634 left="1" mouse_opaque="true" name="money panel3" width="398">
635 <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="-232"
636 embedded_items="false" follows="left|top|right|bottom" font="Monospace"
637 height="224" left="8" max_length="2147483647" mouse_opaque="true"
638 name="money text" width="382" word_wrap="false" />
639 <button bottom="-260" follows="left|bottom" font="SansSerif" halign="center"
640 height="20" label="&lt; Earlier" label_selected="&lt; Earlier" left="24"
641 mouse_opaque="true" name="&lt; Earlier" tool_tip="Go back in time"
642 width="80" />
643 <button bottom="-260" follows="right|bottom" font="SansSerif" halign="center"
644 height="20" label="Later &gt;" label_selected="Later &gt;" left_delta="270"
645 mouse_opaque="true" name="Later &gt;" tool_tip="Go forward in time"
646 width="80" />
647 </panel>
648 </tab_container>
649 </panel>
650 </tab_container>
651 <button bottom="-352" follows="left|bottom" font="SansSerif" halign="center"
652 height="20" label="OK" label_selected="OK" left="320" mouse_opaque="true"
653 name="OK" width="60" />
654 <button bottom="-352" follows="left|bottom" font="SansSerif" halign="center"
655 height="20" label="Cancel" label_selected="Cancel" left_delta="68"
656 mouse_opaque="true" name="Cancel" width="60" />
657</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
index 0854c99..a64560f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -3,43 +3,46 @@
3 <string name="Multiple"> 3 <string name="Multiple">
4 Multiple friends... 4 Multiple friends...
5 </string> 5 </string>
6 <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" 6 <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
7 follows="left|top|bottom|right" left="10" multi_select="true" 7 follows="left|top|bottom|right" left="10" multi_select="true"
8 name="friend_list" right="-100" search_column="1" 8 name="friend_list" right="-100" search_column="1"
9 tool_tip="Hold shift or control while clicking to select multiple friends" 9 tool_tip="Hold shift or control while clicking to select multiple friends"
10 top="-10"> 10 top="-30">
11 <column image="ff_online_status_button.tga" name="icon_online_status" 11 <column image="ff_online_status_button.tga" name="icon_online_status"
12 tool_tip="Online status" width="20" /> 12 tool_tip="Online status" width="20" />
13 <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" /> 13 <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
14 <column image="ff_visible_online_button.tga" name="icon_visible_online" 14 <column image="ff_visible_online_button.tga" name="icon_visible_online"
15 tool_tip="Friend can see when you&apos;re online" width="20" /> 15 tool_tip="Friend can see when you&apos;re online" width="20" />
16 <column image="ff_visible_map_button.tga" name="icon_visible_map" 16 <column image="ff_visible_map_button.tga" name="icon_visible_map"
17 tool_tip="Friend can locate you on the map" width="20" /> 17 tool_tip="Friend can locate you on the map" width="20" />
18 <column image="ff_edit_mine_button.tga" name="icon_edit_mine" 18 <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
19 tool_tip="Friend can edit, delete or take objects" width="20" /> 19 tool_tip="Friend can edit, delete or take objects" width="20" />
20 <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" 20 <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
21 tool_tip="You can locate this friend on the map" width="20" /> 21 tool_tip="You can locate this friend on the map" width="20" />
22 <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" 22 <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
23 tool_tip="You can edit this friend&apos;s objects" width="20" /> 23 tool_tip="You can edit this friend&apos;s objects" width="20" />
24 <column name="friend_last_update_generation" width="0" /> 24 <column name="friend_last_update_generation" width="0" />
25 </scroll_list> 25 </scroll_list>
26 <pad bottom="-7" height="0" left="-90" width="1" /> 26 <pad bottom="-7" height="0" left="-90" width="1" />
27 <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" 27 <button bottom_delta="-45" follows="top|right" height="22" label="IM/Call"
28 left_delta="0" name="im_btn" tool_tip="Open Instant Message session" 28 left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
29 width="80" /> 29 width="80" />
30 <button bottom_delta="-25" follows="top|right" height="22" label="Profile" 30 <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
31 left_delta="0" name="profile_btn" 31 left_delta="0" name="profile_btn"
32 tool_tip="Show picture, groups, and other information" width="80" /> 32 tool_tip="Show picture, groups, and other information" width="80" />
33 <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..." 33 <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
34 left_delta="0" name="offer_teleport_btn" 34 left_delta="0" name="offer_teleport_btn"
35 tool_tip="Offer this friend a teleport to your current location" width="80" /> 35 tool_tip="Offer this friend a teleport to your current location" width="80" />
36 <button bottom_delta="-25" follows="top|right" height="22" label="Pay..." 36 <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
37 left_delta="0" name="pay_btn" 37 left_delta="0" name="pay_btn"
38 tool_tip="Give currency to this friend" width="80" /> 38 tool_tip="Give currency to this friend" width="80" />
39 <button bottom_delta="-25" follows="top|right" height="22" label="Remove..." 39 <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
40 left_delta="0" name="remove_btn" 40 left_delta="0" name="remove_btn"
41 tool_tip="Remove this person from your friends list" width="80" /> 41 tool_tip="Remove this person from your friends list" width="80" />
42 <button bottom_delta="-35" follows="top|right" height="22" label="Add..." 42 <button bottom_delta="-35" follows="top|right" height="22" label="Add..."
43 left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident" 43 left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
44 width="80" /> 44 width="80" />
45 <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
46 height="18" left="10" right="-100" name="buddy_search"
47 label="Type here to search your friends" width="130" />
45</panel> 48</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 22967dc..9303852 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -4,7 +4,7 @@
4 <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true" 4 <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
5 draw_heading="true" draw_stripes="true" enabled="true" 5 draw_heading="true" draw_stripes="true" enabled="true"
6 follows="left|top|right|bottom" left="10" mouse_opaque="true" 6 follows="left|top|right|bottom" left="10" mouse_opaque="true"
7 multi_select="false" name="group list" tab_stop="true" top="-10" 7 multi_select="false" name="group list" tab_stop="true" top="-30"
8 width="240"> 8 width="240">
9 <column label="Group Name" name="name" dynamicwidth="true" /> 9 <column label="Group Name" name="name" dynamicwidth="true" />
10 <column label="Notices" name="receive_notices" width="60" 10 <column label="Notices" name="receive_notices" width="60"
@@ -28,7 +28,7 @@
28 You belong to [COUNT] groups (of [MAX] maximum). 28 You belong to [COUNT] groups (of [MAX] maximum).
29 </text> 29 </text>
30 <pad bottom="-7" height="0" left="-90" width="1" /> 30 <pad bottom="-7" height="0" left="-90" width="1" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 31 <button bottom_delta="-45" follows="top|right" font="SansSerif" height="22"
32 label="IM/Call" left_delta="0" name="IM" 32 label="IM/Call" left_delta="0" name="IM"
33 tool_tip="Open Instant Message session" width="80" /> 33 tool_tip="Open Instant Message session" width="80" />
34 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 34 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
@@ -45,6 +45,9 @@
45 label="Search..." name="Search..." width="80" /> 45 label="Search..." name="Search..." width="80" />
46 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 46 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
47 label="Leave" name="Leave" width="80" /> 47 label="Leave" name="Leave" width="80" />
48 <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
49 height="18" left="10" right="-100" name="group_search"
50 label="Type here to search your groups" width="130" />
48 <string name="none"> 51 <string name="none">
49 none 52 none
50 </string> 53 </string>
generated by cgit v1.1 at 2025-04-03 12:58:45 +0000