aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-03 17:28:47 -0600
committerJacek Antonelli2010-02-03 17:30:56 -0600
commitce961412bfd179093b2c6a48c170d17555f8193c (patch)
treebf7af9f3b5313b2e315790bd973045cc34272b28 /linden/indra
parentChangeLog entries for client identification / name tags. (diff)
parentImproved "Pay Object" floater layout and XML. (diff)
downloadmeta-impy-ce961412bfd179093b2c6a48c170d17555f8193c.zip
meta-impy-ce961412bfd179093b2c6a48c170d17555f8193c.tar.gz
meta-impy-ce961412bfd179093b2c6a48c170d17555f8193c.tar.bz2
meta-impy-ce961412bfd179093b2c6a48c170d17555f8193c.tar.xz
Merged in 'paymessage' branch.
Custom message in Pay Resident floater, and XUI cleanup. (SNOW-436, formerly VWR-9597)
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/llui/llfloater.cpp26
-rw-r--r--linden/indra/llui/llfloater.h6
-rw-r--r--linden/indra/newview/llgivemoney.cpp31
-rw-r--r--linden/indra/newview/skins/default/xui/da/floater_pay.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/da/floater_pay_object.xml43
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_pay.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/de/floater_pay_object.xml43
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_pay.xml117
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml140
-rw-r--r--linden/indra/newview/skins/default/xui/es/floater_pay.xml30
-rw-r--r--linden/indra/newview/skins/default/xui/es/floater_pay_object.xml43
-rw-r--r--linden/indra/newview/skins/default/xui/fr/floater_pay.xml34
-rw-r--r--linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml52
-rw-r--r--linden/indra/newview/skins/default/xui/hu/floater_pay.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml43
-rw-r--r--linden/indra/newview/skins/default/xui/it/floater_pay.xml34
-rw-r--r--linden/indra/newview/skins/default/xui/it/floater_pay_object.xml50
-rw-r--r--linden/indra/newview/skins/default/xui/ja/floater_pay.xml24
-rw-r--r--linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml38
-rw-r--r--linden/indra/newview/skins/default/xui/ko/floater_pay.xml24
-rw-r--r--linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml38
-rwxr-xr-xlinden/indra/newview/skins/default/xui/pl/floater_pay.xml30
-rwxr-xr-xlinden/indra/newview/skins/default/xui/pl/floater_pay_object.xml44
-rw-r--r--linden/indra/newview/skins/default/xui/pt/floater_pay.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml46
-rw-r--r--linden/indra/newview/skins/default/xui/ru/floater_pay.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml46
-rw-r--r--linden/indra/newview/skins/default/xui/tr/floater_pay.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml43
-rw-r--r--linden/indra/newview/skins/default/xui/uk/floater_pay.xml30
-rw-r--r--linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml46
-rw-r--r--linden/indra/newview/skins/default/xui/zh/floater_pay.xml24
-rw-r--r--linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml38
33 files changed, 682 insertions, 655 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 8a03300..5c46d54 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -691,11 +691,11 @@ void LLFloater::applyTitle()
691 691
692 if (isMinimized() && !mShortTitle.empty()) 692 if (isMinimized() && !mShortTitle.empty())
693 { 693 {
694 mDragHandle->setTitle( mShortTitle ); 694 mDragHandle->setTitle( mShortTitle.getString() );
695 } 695 }
696 else 696 else
697 { 697 {
698 mDragHandle->setTitle ( mTitle ); 698 mDragHandle->setTitle ( mTitle.getString() );
699 } 699 }
700} 700}
701 701
@@ -706,7 +706,7 @@ const std::string& LLFloater::getCurrentTitle() const
706 706
707void LLFloater::setTitle( const std::string& title ) 707void LLFloater::setTitle( const std::string& title )
708{ 708{
709 mTitle = title; 709 mTitle.assign(title);
710 applyTitle(); 710 applyTitle();
711} 711}
712 712
@@ -718,13 +718,13 @@ std::string LLFloater::getTitle()
718 } 718 }
719 else 719 else
720 { 720 {
721 return mTitle; 721 return mTitle.getString();
722 } 722 }
723} 723}
724 724
725void LLFloater::setShortTitle( const std::string& short_title ) 725void LLFloater::setShortTitle( const std::string& short_title )
726{ 726{
727 mShortTitle = short_title; 727 mShortTitle.assign(short_title);
728 applyTitle(); 728 applyTitle();
729} 729}
730 730
@@ -736,11 +736,25 @@ std::string LLFloater::getShortTitle()
736 } 736 }
737 else 737 else
738 { 738 {
739 return mShortTitle; 739 return mShortTitle.getString();
740 } 740 }
741} 741}
742 742
743 743
744BOOL LLFloater::setTitleArg( const std::string& key, const LLStringExplicit& text )
745{
746 mTitle.setArg(key, text);
747 applyTitle();
748 return TRUE;
749}
750
751BOOL LLFloater::setShortTitleArg( const std::string& key, const LLStringExplicit& text )
752{
753 mShortTitle.setArg(key, text);
754 applyTitle();
755 return TRUE;
756}
757
744 758
745BOOL LLFloater::canSnapTo(const LLView* other_view) 759BOOL LLFloater::canSnapTo(const LLView* other_view)
746{ 760{
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 12f878d..fa69258 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -165,6 +165,8 @@ public:
165 std::string getTitle(); 165 std::string getTitle();
166 void setShortTitle( const std::string& short_title ); 166 void setShortTitle( const std::string& short_title );
167 std::string getShortTitle(); 167 std::string getShortTitle();
168 BOOL setTitleArg( const std::string& key, const LLStringExplicit& text );
169 BOOL setShortTitleArg( const std::string& key, const LLStringExplicit& text );
168 void setTitleVisible(bool visible); 170 void setTitleVisible(bool visible);
169 virtual void setMinimized(BOOL b); 171 virtual void setMinimized(BOOL b);
170 void moveResizeHandlesToFront(); 172 void moveResizeHandlesToFront();
@@ -276,8 +278,8 @@ private:
276 BOOL mMinimized; 278 BOOL mMinimized;
277 BOOL mForeground; 279 BOOL mForeground;
278 LLHandle<LLFloater> mDependeeHandle; 280 LLHandle<LLFloater> mDependeeHandle;
279 std::string mTitle; 281 LLUIString mTitle;
280 std::string mShortTitle; 282 LLUIString mShortTitle;
281 283
282 BOOL mFirstLook; // TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible. 284 BOOL mFirstLook; // TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible.
283 285
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index dd28bda..423357d 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -147,7 +147,9 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
147 ++i; 147 ++i;
148 148
149 149
150 childSetVisible("amount text", FALSE); 150 childSetVisible("amount text", FALSE);
151 childSetVisible("currency text", FALSE);
152
151 153
152 std::string last_amount; 154 std::string last_amount;
153 if(sLastAmount > 0) 155 if(sLastAmount > 0)
@@ -155,7 +157,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
155 last_amount = llformat("%d", sLastAmount); 157 last_amount = llformat("%d", sLastAmount);
156 } 158 }
157 159
158 childSetVisible("amount", FALSE); 160 childSetVisible("amount", FALSE);
159 161
160 childSetKeystrokeCallback("amount", &LLFloaterPay::onKeystroke, this); 162 childSetKeystrokeCallback("amount", &LLFloaterPay::onKeystroke, this);
161 childSetText("amount", last_amount); 163 childSetText("amount", last_amount);
@@ -207,12 +209,15 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
207 self->childSetVisible("amount", FALSE); 209 self->childSetVisible("amount", FALSE);
208 self->childSetVisible("pay btn", FALSE); 210 self->childSetVisible("pay btn", FALSE);
209 self->childSetVisible("amount text", FALSE); 211 self->childSetVisible("amount text", FALSE);
212 self->childSetVisible("currency text", FALSE);
213
210 } 214 }
211 else if (PAY_PRICE_DEFAULT == price) 215 else if (PAY_PRICE_DEFAULT == price)
212 { 216 {
213 self->childSetVisible("amount", TRUE); 217 self->childSetVisible("amount", TRUE);
214 self->childSetVisible("pay btn", TRUE); 218 self->childSetVisible("pay btn", TRUE);
215 self->childSetVisible("amount text", TRUE); 219 self->childSetVisible("amount text", TRUE);
220 self->childSetVisible("currency text", TRUE);
216 } 221 }
217 else 222 else
218 { 223 {
@@ -223,6 +228,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
223 self->childSetVisible("pay btn", TRUE); 228 self->childSetVisible("pay btn", TRUE);
224 self->childSetEnabled("pay btn", TRUE); 229 self->childSetEnabled("pay btn", TRUE);
225 self->childSetVisible("amount text", TRUE); 230 self->childSetVisible("amount text", TRUE);
231 self->childSetVisible("currency text", TRUE);
226 232
227 self->childSetText("amount", llformat("%d", llabs(price))); 233 self->childSetText("amount", llformat("%d", llabs(price)));
228 } 234 }
@@ -347,7 +353,7 @@ void LLFloaterPay::payViaObject(money_callback callback, const LLUUID& object_id
347 BOOL is_group = FALSE; 353 BOOL is_group = FALSE;
348 node->mPermissions->getOwnership(owner_id, is_group); 354 node->mPermissions->getOwnership(owner_id, is_group);
349 355
350 floater->childSetText("object_name_text",node->mName); 356 floater->childSetTextArg("via object", "[OBJECT]", node->mName);
351 357
352 floater->finishPayUI(owner_id, is_group); 358 floater->finishPayUI(owner_id, is_group);
353} 359}
@@ -362,6 +368,7 @@ void LLFloaterPay::payDirectly(money_callback callback,
362 floater->childSetVisible("amount", TRUE); 368 floater->childSetVisible("amount", TRUE);
363 floater->childSetVisible("pay btn", TRUE); 369 floater->childSetVisible("pay btn", TRUE);
364 floater->childSetVisible("amount text", TRUE); 370 floater->childSetVisible("amount text", TRUE);
371 floater->childSetVisible("currency text", TRUE);
365 372
366 floater->childSetVisible("fastpay text",TRUE); 373 floater->childSetVisible("fastpay text",TRUE);
367 for(S32 i=0;i<MAX_PAY_BUTTONS;++i) 374 for(S32 i=0;i<MAX_PAY_BUTTONS;++i)
@@ -397,17 +404,18 @@ void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id,
397 404
398 if (is_group) 405 if (is_group)
399 { 406 {
400 self->childSetVisible("payee_group",true); 407 self->setTitleArg("[PAY TYPE]", self->getString("pay group") );
401 self->childSetVisible("payee_resident",false);
402 } 408 }
403 else 409 else
404 { 410 {
405 self->childSetVisible("payee_group",false); 411 self->setTitleArg("[PAY TYPE]", self->getString("pay resident") );
406 self->childSetVisible("payee_resident",true);
407 } 412 }
408 413
409 self->childSetTextArg("payee_name", "[FIRST]", firstname); 414 self->childSetTextArg("payee_name", "[FIRST]", firstname);
410 self->childSetTextArg("payee_name", "[LAST]", lastname); 415 self->childSetTextArg("payee_name", "[LAST]", lastname);
416
417 self->setTitleArg("[FIRST]", firstname);
418 self->setTitleArg("[LAST]", lastname);
411} 419}
412 420
413// static 421// static
@@ -491,8 +499,15 @@ void LLFloaterPay::give(S32 amount)
491 } 499 }
492 else 500 else
493 { 501 {
502 // Custom message typed in by the user.
503 std::string desc = LLStringUtil::null;
504 if (!childGetText("message").empty())
505 {
506 desc = childGetText("message");
507 }
508
494 // just transfer the L$ 509 // just transfer the L$
495 mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLStringUtil::null); 510 mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, desc);
496 511
497 // check if the payee needs to be unmuted 512 // check if the payee needs to be unmuted
498 LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY); 513 LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY);
diff --git a/linden/indra/newview/skins/default/xui/da/floater_pay.xml b/linden/indra/newview/skins/default/xui/da/floater_pay.xml
index cca4240..51095e9 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_pay.xml
@@ -1,21 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Betal beboer: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="Betal" label_selected="Betal" name="pay btn" />
8 <button label="Annullér" label_selected="Annullér" name="cancel btn" />
9 <text type="string" length="1" name="payee_label" left="5" width="81">
10 Betal beboer:
11 </text>
12 <text type="string" length="1" name="payee_name">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 Hurtig betal: 5 Hurtig betal:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text" left="4" > 7
8 <button name="fastpay 1" label="L$1" />
9 <button name="fastpay 5" label="L$5" />
10 <button name="fastpay 10" label="L$10" />
11 <button name="fastpay 20" label="L$20" />
12
13 <text name="amount text">
19 Beløb: 14 Beløb:
20 </text> 15 </text>
16
17 <button name="pay btn" label="Betal" />
18 <button name="cancel btn" label="Annullér" />
19
21</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
index 465f7e8..318f96d 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -1,30 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group"> 3
4 <string name="pay group">
4 Betal gruppe: 5 Betal gruppe:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident"> 7 <string name="pay resident">
7 Betal beboer: 8 Betal beboer:
9 </string>
10
11 <text name="via object">
12 Via objekt: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label">
13 Via objekt:
14 </text>
15 <text type="string" length="1" name="object_name_text">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text">
19 Hurtig betal: 16 Hurtig betal:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <button name="fastpay 1" label="L$1" />
20 <button name="fastpay 5" label="L$5" />
21 <button name="fastpay 10" label="L$10" />
22 <button name="fastpay 20" label="L$20" />
23
24 <text name="amount text">
22 Beløb: 25 Beløb:
23 </text> 26 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 27
25 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 28 <button name="pay btn" label="Betal" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" /> 29 <button name="cancel btn" label="Annullér" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" /> 30
28 <button label="Betal" label_selected="Betal" name="pay btn" />
29 <button label="Annullér" label_selected="Annullér" name="cancel btn" />
30</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay.xml b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
index 5d0dbff..dc38697 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -1,21 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Einwohner bezahlen: [FIRST] [LAST]">
3 <button label="1 L$" label_selected="1 L$" name="fastpay 1" /> 3
4 <button label="5 L$" label_selected="5 L$" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="10 L$" label_selected="10 L$" name="fastpay 10" />
6 <button label="20 L$" label_selected="20 L$" name="fastpay 20" />
7 <button label="Zahlen" label_selected="Zahlen" name="pay btn" />
8 <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" />
9 <text type="string" length="1" name="payee_label" width="130">
10 Einwohner bezahlen:
11 </text>
12 <text type="string" length="1" name="payee_name" left="130">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 Schnellzahlung: 5 Schnellzahlung:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text"> 7
8 <button name="fastpay 1" label="1 L$" left="115" />
9 <button name="fastpay 5" label="5 L$" />
10 <button name="fastpay 10" label="10 L$" left="115" />
11 <button name="fastpay 20" label="20 L$" />
12
13 <text name="amount text">
19 Betrag: 14 Betrag:
20 </text> 15 </text>
16
17 <button name="pay btn" label="Zahlen" />
18 <button name="cancel btn" label="Abbrechen" />
19
21</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index eaf95a9..55ad735 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,30 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group" width="105"> 3
4 <string name="pay group">
4 Gruppe bezahlen: 5 Gruppe bezahlen:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident" width="118"> 7 <string name="pay resident">
7 Einwohner bezahlen: 8 Einwohner bezahlen:
9 </string>
10
11 <text name="via object">
12 Über Objekt: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name" left="128" width="168"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label" halign="left">
13 Über Objekt:
14 </text>
15 <text type="string" length="1" name="object_name_text" left="105">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text" width="95" halign="left">
19 Schnellzahlung: 16 Schnellzahlung:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <button name="fastpay 1" label="1 L$" left="115" />
20 <button name="fastpay 5" label="5 L$" />
21 <button name="fastpay 10" label="10 L$" left="115" />
22 <button name="fastpay 20" label="20 L$" />
23
24 <text name="amount text">
22 Betrag: 25 Betrag:
23 </text> 26 </text>
24 <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" /> 27
25 <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190" /> 28 <button name="pay btn" label="Zahlen" />
26 <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" /> 29 <button name="cancel btn" label="Abbrechen" />
27 <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190" /> 30
28 <button label="Zahlen" label_selected="Zahlen" name="pay btn" />
29 <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76" />
30</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index 8f0553d..9caf96e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -1,53 +1,76 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-197" can_close="true" can_drag_on_left="false" can_minimize="false" 2
3 can_resize="false" enabled="true" height="140" left="439" min_height="100" 3<floater name="Give Money" title="Pay resident: [FIRST] [LAST]"
4 min_width="100" mouse_opaque="true" name="Give Money" 4 bottom="-197" left="439" height="185" width="300"
5 rect_control="FloaterPayRectB" title="" width="300"> 5 min_height="100" min_width="100" rect_control="FloaterPayRectB"
6 <button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20" 6 can_minimize="true" can_resize="false">
7 label="L$1" label_selected="L$1" left="108" mouse_opaque="true" 7
8 name="fastpay 1" scale_image="true" width="80" /> 8
9 <button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20" 9 <text name="fastpay text"
10 label="L$5" label_selected="L$5" left="203" mouse_opaque="true" 10 bottom="-50" left="15" height="18" width="100"
11 name="fastpay 5" scale_image="true" width="80" /> 11 follows="left|top" font="SansSerif">
12 <button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20" 12 Fast Pay:
13 label="L$10" label_selected="L$10" left="108" mouse_opaque="true"
14 name="fastpay 10" scale_image="true" width="80" />
15 <button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
16 label="L$20" label_selected="L$20" left="203" mouse_opaque="true"
17 name="fastpay 20" scale_image="true" width="80" />
18 <button bottom="-132" enabled="false" font="SansSerif" halign="center" height="20"
19 label="Pay" label_selected="Pay" left="120" mouse_opaque="true"
20 name="pay btn" scale_image="true" width="80" />
21 <button bottom="-132" enabled="true" font="SansSerif" halign="center" height="20"
22 label="Cancel" label_selected="Cancel" left="203" mouse_opaque="true"
23 name="cancel btn" scale_image="true" width="80" />
24 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
25 bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
26 font="SansSerif" h_pad="0" halign="left" height="18" left="12"
27 mouse_opaque="true" name="payee_label" v_pad="0" width="75">
28 Pay resident:
29 </text> 13 </text>
30 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 14
31 bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top" 15 <button name="fastpay 1" label="L$1"
32 font="SansSerif" h_pad="0" halign="left" height="18" left="85" 16 bottom_delta="0" left="95" height="20" width="75"
33 mouse_opaque="true" name="payee_name" v_pad="0" width="210"> 17 font="SansSerif" halign="center" scale_image="true" />
34 [FIRST] [LAST] 18
19 <button name="fastpay 5" label="L$5"
20 bottom_delta="0" left_delta="85" height="20" width="75"
21 font="SansSerif" halign="center" scale_image="true" />
22
23 <button name="fastpay 10" label="L$10"
24 bottom_delta="-25" left="95" height="20" width="75"
25 font="SansSerif" halign="center" scale_image="true" />
26
27 <button name="fastpay 20" label="L$20"
28 bottom_delta="0" left_delta="85" height="20" width="75"
29 font="SansSerif" halign="center" scale_image="true" />
30
31
32 <view_border name="separator left"
33 bottom_delta="-12" left="8" height="1" width="282"
34 bevel_style="in" border_thickness="1" follows="top|left" />
35
36
37 <text name="message text"
38 bottom_delta="-32" left="15" height="18" width="60"
39 follows="left|top" font="SansSerif">
40 Message:
35 </text> 41 </text>
36 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 42
37 bottom="-72" drop_shadow_visible="true" enabled="true" follows="left|top" 43 <line_editor name="message" max_length="140"
38 font="SansSerif" h_pad="0" halign="right" height="18" left="5" 44 bottom_delta="1" left="80" height="18" right="-15"
39 mouse_opaque="true" name="fastpay text" v_pad="0" width="95"> 45 bevel_style="in" border_style="line" border_thickness="1"
40 Fast Pay: 46 follows="left|top|right" font="SansSerif" />
47
48
49 <text name="amount text"
50 bottom_delta="-28" left="15" height="18" width="70"
51 follows="left|top" font="SansSerif">
52 Amount:
41 </text> 53 </text>
42 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 54
43 bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top" 55 <text name="currency text"
44 font="SansSerif" h_pad="0" halign="left" height="18" left="12" 56 bottom_delta="0" left_delta="67" height="18" width="15"
45 mouse_opaque="true" name="amount text" v_pad="0" width="75"> 57 follows="left|top" font="SansSerif">
46 Amount: 58 L$
47 </text> 59 </text>
48 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-130" 60
49 enabled="true" follows="left|top|right" font="SansSerif" 61 <line_editor name="amount" max_length="9"
50 handle_edit_keys_directly="false" height="18" left="58" max_length="9" 62 bottom_delta="1" left_delta="18" height="18" width="70"
51 mouse_opaque="true" name="amount" select_all_on_focus_received="false" 63 bevel_style="in" border_style="line" border_thickness="1"
52 select_on_focus="false" width="57" /> 64 follows="left|top|right" font="SansSerif" />
65
66 <button name="pay btn" label="Pay"
67 bottom_delta="-2" left_delta="80" height="20" width="75"
68 font="SansSerif" halign="center" scale_image="true" />
69
70
71 <button name="cancel btn" label="Cancel"
72 bottom="5" right="-5" height="20" width="85"
73 font="SansSerif" halign="center" scale_image="true" />
74
75
53</floater> 76</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
index 03e009d..e66d8d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
@@ -1,72 +1,80 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-521" can_close="true" can_drag_on_left="false" can_minimize="false" 2
3 can_resize="false" enabled="true" height="140" left="690" min_height="100" 3<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST]"
4 min_width="100" mouse_opaque="true" name="Give Money" 4 rect_control="FloaterPayRectB"
5 rect_control="FloaterPayRectB" title="" width="300"> 5 can_minimize="true" can_resize="false"
6 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 6 bottom="-197" left="439" height="170" width="300">
7 bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top" 7
8 font="SansSerif" h_pad="0" halign="right" height="18" left="5" 8
9 mouse_opaque="true" name="payee_group" v_pad="0" width="75"> 9 <string name="pay group">
10 Pay group: 10 Pay Group:
11 </string>
12 <string name="pay resident">
13 Pay Resident:
14 </string>
15
16
17 <text name="via object" type="string"
18 bottom="-45" left="15" height="18" width="250"
19 follows="left|top" font="SansSerif" halign="left">
20 Via object: [OBJECT]
11 </text> 21 </text>
12 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 22
13 bottom_delta="0" drop_shadow_visible="true" enabled="true" 23
14 follows="left|top" font="SansSerif" h_pad="0" halign="right" height="18" 24 <text name="fastpay text" type="string" length="1"
15 left="5" mouse_opaque="true" name="payee_resident" v_pad="0" width="75"> 25 bottom_delat="-25" left="15" height="18" width="100"
16 Pay resident: 26 follows="left|top" font="SansSerif" halign="left">
27 Fast Pay:
17 </text> 28 </text>
18 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 29
19 bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top" 30 <button name="fastpay 1" label="L$1"
20 font="SansSerif" h_pad="0" halign="left" height="18" left="85" 31 bottom_delta="0" left="95" height="20" width="75"
21 mouse_opaque="true" name="payee_name" v_pad="0" width="210"> 32 font="SansSerif" halign="center" scale_image="true" />
22 [FIRST] [LAST] 33
34 <button name="fastpay 5" label="L$5"
35 bottom_delta="0" left_delta="85" height="20" width="75"
36 font="SansSerif" halign="center" scale_image="true" />
37
38 <button name="fastpay 10" label="L$10"
39 bottom_delta="-25" left="95" height="20" width="75"
40 font="SansSerif" halign="center" scale_image="true" />
41
42 <button name="fastpay 20" label="L$20"
43 bottom_delta="0" left_delta="85" height="20" width="75"
44 font="SansSerif" halign="center" scale_image="true" />
45
46
47 <view_border name="separator left"
48 bottom_delta="-12" left="8" height="1" width="282"
49 bevel_style="in" border_thickness="1" follows="top|left" />
50
51
52 <text name="amount text" type="string" length="1"
53 bottom_delta="-28" left="15" height="18" width="70"
54 follows="left|top" font="SansSerif" halign="left">
55 Amount:
23 </text> 56 </text>
24 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 57
25 bottom="-50" drop_shadow_visible="true" enabled="true" follows="left|top" 58 <text name="currency text" type="string" length="1"
26 font="SansSerif" h_pad="0" halign="right" height="18" left="5" 59 bottom_delta="0" left_delta="62" height="18" width="15"
27 mouse_opaque="true" name="object_name_label" v_pad="0" width="75"> 60 follows="left|top" font="SansSerif" halign="left">
28 Via object: 61 L$
29 </text> 62 </text>
30 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 63
31 bottom="-50" drop_shadow_visible="true" enabled="true" follows="left|top" 64 <line_editor name="amount" max_length="9"
32 font="SansSerif" h_pad="0" halign="left" height="18" left="85" 65 bottom_delta="1" left_delta="18" height="18" width="70"
33 mouse_opaque="true" name="object_name_text" v_pad="0" width="210"> 66 bevel_style="in" border_style="line" border_thickness="1"
34 ... 67 follows="left|top|right" font="SansSerif" />
35 </text> 68
36 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 69 <button name="pay btn" label="Pay"
37 bottom="-72" drop_shadow_visible="true" enabled="true" follows="left|top" 70 bottom_delta="-2" left_delta="80" height="20" width="75"
38 font="SansSerif" h_pad="0" halign="right" height="18" left="5" 71 font="SansSerif" halign="center" scale_image="true" />
39 mouse_opaque="true" name="fastpay text" v_pad="0" width="75"> 72
40 Fast Pay: 73
41 </text> 74 <button name="cancel btn" label="Cancel"
42 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 75 bottom="5" right="-5" height="20" width="85"
43 bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top" 76 font="SansSerif" halign="center" scale_image="true" />
44 font="SansSerif" h_pad="0" halign="right" height="18" left="5" 77
45 mouse_opaque="true" name="amount text" v_pad="0" width="75"> 78
46 Amount: 79
47 </text>
48 <button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
49 label="L$1" label_selected="L$1" left="85" mouse_opaque="true"
50 name="fastpay 1" scale_image="true" width="80" />
51 <button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
52 label="L$5" label_selected="L$5" left="170" mouse_opaque="true"
53 name="fastpay 5" scale_image="true" width="80" />
54 <button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
55 label="L$10" label_selected="L$10" left="85" mouse_opaque="true"
56 name="fastpay 10" scale_image="true" width="80" />
57 <button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
58 label="L$20" label_selected="L$20" left="170" mouse_opaque="true"
59 name="fastpay 20" scale_image="true" width="80" />
60 <button bottom="-132" enabled="false" follows="right|bottom" font="SansSerif"
61 halign="center" height="20" label="Pay" label_selected="Pay" left="140"
62 mouse_opaque="true" name="pay btn" scale_image="true" width="70" />
63 <button bottom="-132" enabled="true" follows="right|bottom" font="SansSerif"
64 halign="center" height="20" label="Cancel" label_selected="Cancel"
65 left="215" mouse_opaque="true" name="cancel btn" scale_image="true"
66 width="70" />
67 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-130"
68 enabled="true" follows="left|top|right" font="SansSerif"
69 handle_edit_keys_directly="false" height="18" left="85" max_length="9"
70 mouse_opaque="true" name="amount" select_all_on_focus_received="false"
71 select_on_focus="false" width="50" />
72</floater> 80</floater>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_pay.xml b/linden/indra/newview/skins/default/xui/es/floater_pay.xml
index 11c1f23..bf195d9 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -1,22 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Pagar al residente: [FIRST] [LAST]">
3 <button label="1 L$" label_selected="1 L$" name="fastpay 1"/> 3
4 <button label="5 L$" label_selected="5 L$" name="fastpay 5"/> 4 <text name="fastpay text">
5 <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
6 <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
7 <button label="Pagar" label_selected="Pagar" name="pay btn"/>
8 <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
9 <text length="1" name="payee_label" type="string" left="5" width="105">
10 Pagar al residente:
11 </text>
12 <text length="1" name="payee_name" type="string" left="115">
13 [FIRST] [LAST]
14 </text>
15 <text length="1" name="fastpay text" type="string" width="100" halign="left">
16 Pago rápido: 5 Pago rápido:
17 </text> 6 </text>
18 <text length="1" name="amount text" type="string" left="4" > 7
8 <button name="fastpay 1" label="1 L$" />
9 <button name="fastpay 5" label="5 L$" />
10 <button name="fastpay 10" label="10 L$" />
11 <button name="fastpay 20" label="20 L$" />
12
13 <text name="amount text">
19 Cantidad: 14 Cantidad:
20 </text> 15 </text>
21 <line_editor left="60" name="amount" width="55"/> 16
17 <button name="pay btn" label="Pagar" />
18 <button name="cancel btn" label="Cancelar" />
19
22</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 4caee3d..5baf0ad 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,30 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text length="1" name="payee_group" type="string" left="5" width="110"> 3
4 <string name="pay group">
4 Pagar al grupo: 5 Pagar al grupo:
5 </text> 6 </string>
6 <text length="1" name="payee_resident" type="string" left="5" width="110"> 7 <string name="pay resident">
7 Pagar al residente: 8 Pagar al residente:
9 </string>
10
11 <text name="via object">
12 A través del objeto: [OBJECT]
8 </text> 13 </text>
9 <text length="1" name="payee_name" type="string" left="120" width="180"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text length="1" name="object_name_label" type="string" left="5" width="110">
13 A través del objeto:
14 </text>
15 <text length="1" name="object_name_text" type="string" left="120" width="180">
16 ...
17 </text>
18 <text length="1" name="fastpay text" type="string">
19 Pago rápido: 16 Pago rápido:
20 </text> 17 </text>
21 <text length="1" name="amount text" type="string"> 18
19 <button name="fastpay 1" label="1 L$" />
20 <button name="fastpay 5" label="5 L$" />
21 <button name="fastpay 10" label="10 L$" />
22 <button name="fastpay 20" label="20 L$" />
23
24 <text name="amount text">
22 Cantidad: 25 Cantidad:
23 </text> 26 </text>
24 <button label="1 L$" label_selected="1 L$" name="fastpay 1"/> 27
25 <button label="5 L$" label_selected="5 L$" name="fastpay 5"/> 28 <button name="pay btn" label="Pagar" />
26 <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> 29 <button name="cancel btn" label="Cancelar" />
27 <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> 30
28 <button label="Pagar" label_selected="Pagar" name="pay btn"/>
29 <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
30</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_pay.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
index c5b689e..02cf032 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,22 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Payer: [FIRST] [LAST]">
3 <button label="1 L$" label_selected="1 L$" name="fastpay 1"/> 3
4 <button label="5 L$" label_selected="5 L$" name="fastpay 5"/> 4 <text name="fastpay text">
5 <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> 5 Paiement rapide:
6 <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
7 <button label="Payer" label_selected="Payer" name="pay btn"/>
8 <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
9 <text length="1" name="payee_label" type="string" left="5">
10 Payer :
11 </text> 6 </text>
12 <text length="1" name="payee_name" type="string"> 7
13 [FIRST] [LAST] 8 <button name="fastpay 1" label="1 L$" left="120" />
9 <button name="fastpay 5" label="5 L$" />
10 <button name="fastpay 10" label="10 L$" left="120" />
11 <button name="fastpay 20" label="20 L$" />
12
13 <text name="amount text">
14 Montant:
14 </text> 15 </text>
15 <text length="1" name="fastpay text" type="string" width="100" halign="left"> 16
16 Paiement rapide : 17 <button name="pay btn" label="Payer" />
17 </text> 18 <button name="cancel btn" label="Annuler" />
18 <text left="4" length="1" name="amount text" type="string"> 19
19 Montant :
20 </text>
21 <line_editor left="60" name="amount" width="55"/>
22</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 3dc0af7..57e71e5 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,31 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" >
3 <text length="1" name="payee_group" type="string" width="95"> 3
4 Payer le groupe : 4 <string name="pay group">
5 Payer le groupe:
6 </string>
7 <string name="pay resident">
8 Payer le résident:
9 </string>
10
11 <text name="via object">
12 Via un objet: [OBJECT]
5 </text> 13 </text>
6 <text length="1" name="payee_resident" type="string" width="100" halign="left" > 14
7 Payer le résident : 15 <text name="fastpay text">
16 Paiement rapide:
8 </text> 17 </text>
9 <text length="1" name="payee_name" type="string" left="105"> 18
10 [FIRST] [LAST] 19 <button name="fastpay 1" label="1 L$" left="120" />
20 <button name="fastpay 5" label="5 L$" />
21 <button name="fastpay 10" label="10 L$" left="120" />
22 <button name="fastpay 20" label="20 L$" />
23
24 <text name="amount text">
25 Montant:
11 </text> 26 </text>
12 <text length="1" name="object_name_label" type="string" left="25"> 27
13 Via un objet : 28 <button name="pay btn" label="Payer" />
14 </text> 29 <button name="cancel btn" label="Annuler" />
15 <text length="1" name="object_name_text" type="string" left="105"> 30
16 ...
17 </text>
18 <text length="1" name="fastpay text" type="string" width="95">
19 Paiement rapide :
20 </text>
21 <text length="1" name="amount text" type="string" left="5" halign="left">
22 Montant :
23 </text>
24 <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
25 <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
26 <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
27 <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
28 <button label="Payer" label_selected="Payer" name="pay btn"/>
29 <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
30 <line_editor left="65" name="amount" width="50" />
31</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_pay.xml b/linden/indra/newview/skins/default/xui/hu/floater_pay.xml
index f2de810c..b01019a 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_pay.xml
@@ -1,21 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Fizetés ennek a lakónak: [FIRST] [LAST]">
3 <button label="1 L$" label_selected="1 L$" name="fastpay 1" /> 3
4 <button label="5 L$" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="10 L$" label_selected="10 L$" name="fastpay 10" />
6 <button label="20 L$" label_selected="L$20" name="fastpay 20" />
7 <button label="Fizet" label_selected="Fizet" name="pay btn" />
8 <button label="Mégsem" label_selected="Mégsem" name="cancel btn" />
9 <text type="string" length="1" name="payee_label" width="142" left="5">
10 Fizetés ennek a lakónak:
11 </text>
12 <text type="string" length="1" name="payee_name" left="145">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 Gyorsfizetés: 5 Gyorsfizetés:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text" left="4" > 7
8 <button name="fastpay 1" label="1 L$" left="105" />
9 <button name="fastpay 5" label="5 L$" />
10 <button name="fastpay 10" label="10 L$" left="105" />
11 <button name="fastpay 20" label="20 L$" />
12
13 <text name="amount text">
19 Összeg: 14 Összeg:
20 </text> 15 </text>
16
17 <button name="pay btn" label="Fizet" />
18 <button name="cancel btn" label="Mégsem" />
19
21</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
index 36c5c65..27e0de6 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
@@ -1,30 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group" left="5" width="110"> 3
4 <string name="pay group">
4 Fizetés csoportnak: 5 Fizetés csoportnak:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident" left="5" width="110"> 7 <string name="pay resident">
7 Fizetés lakónak: 8 Fizetés lakónak:
9 </string>
10
11 <text name="via object">
12 Tárgy által: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name" left="120" width="180"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label">
13 Tárgy által:
14 </text>
15 <text type="string" length="1" name="object_name_text">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text">
19 Gyorsfizetés: 16 Gyorsfizetés:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <button name="fastpay 1" label="1 L$" left="105" />
20 <button name="fastpay 5" label="5 L$" />
21 <button name="fastpay 10" label="10 L$" left="105" />
22 <button name="fastpay 20" label="20 L$" />
23
24 <text name="amount text">
22 Összeg: 25 Összeg:
23 </text> 26 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 27
25 <button label="5 L$" label_selected="5 L$" name="fastpay 5" /> 28 <button name="pay btn" label="Fizet" />
26 <button label="10 L$" label_selected="10 L$" name="fastpay 10" /> 29 <button name="cancel btn" label="Mégsem" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" /> 30
28 <button label="Fizet" label_selected="Fizet" name="pay btn" />
29 <button label="Töröl" label_selected="Töröl" name="cancel btn" />
30</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_pay.xml b/linden/indra/newview/skins/default/xui/it/floater_pay.xml
index 4889f97..0bd49ee 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -1,22 +1,24 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Paga residente: [FIRST] [LAST]">
3 <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="118" width="80" /> 3
4 <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="210"/> 4 <text name="fastpay text" left="10" width="120">
5 <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="118" width="80" />
6 <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="210"/>
7 <button label="Paga" label_selected="Paga" name="pay btn" left="127"/>
8 <button label="Annulla" label_selected="Annulla" name="cancel btn" left="210"/>
9 <text name="payee_label" left="5" width="105">
10 Paga residente:
11 </text>
12 <text name="payee_name" left="115">
13 [FIRST] [LAST]
14 </text>
15 <text name="fastpay text" width="110" halign="left">
16 Pagamento veloce: 5 Pagamento veloce:
17 </text> 6 </text>
18 <text name="amount text" left="4" > 7
8 <button name="fastpay 1" label="1 L$" left="130" />
9 <button name="fastpay 5" label="5 L$" left_delta="80" />
10 <button name="fastpay 10" label="10 L$" left="130" />
11 <button name="fastpay 20" label="20 L$" left_delta="80" />
12
13 <text name="amount text" left="10">
19 Ammontare: 14 Ammontare:
20 </text> 15 </text>
21 <line_editor left="70" name="amount" width="49"/> 16
17 <text name="L$ text" left_delta="82" >
18 L$
19 </text>
20
21 <button name="pay btn" label="Paga" />
22 <button name="cancel btn" label="Annulla" />
23
22</floater> 24</floater>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
index c41c0ba..59fdf02 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
@@ -1,31 +1,35 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?> 1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text name="payee_group" width="100" halign="left"> 3
4 <string name="pay group">
4 Paga il gruppo: 5 Paga il gruppo:
5 </text> 6 </string>
6 <text name="payee_resident" width="120" halign="left"> 7 <string name="pay resident">
7 Paga il residente: 8 Paga il residente:
9 </string>
10
11 <text name="via object" left="10">
12 Mediante l&apos;oggetto: [OBJECT]
8 </text> 13 </text>
9 <text name="payee_name" left="120"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text" left="10" width="120">
11 </text> 16 Pagamento veloce:
12 <text name="object_name_label" left="5" width="110" halign="left">
13 Mediante l&apos;oggetto:
14 </text>
15 <text name="object_name_text" left="120" >
16 ...
17 </text> 17 </text>
18 <text name="fastpay text" width="115" halign="left"> 18
19 Pagamento diretto: 19 <button name="fastpay 1" label="1 L$" left="130" />
20 </text> 20 <button name="fastpay 5" label="5 L$" left_delta="80" />
21 <text name="amount text" left="5" halign="left"> 21 <button name="fastpay 10" label="10 L$" left="130" />
22 <button name="fastpay 20" label="20 L$" left_delta="80" />
23
24 <text name="amount text" left="10">
22 Ammontare: 25 Ammontare:
23 </text> 26 </text>
24 <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="125" width="70"/> 27
25 <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="200" width="70"/> 28 <text name="L$ text" left_delta="82">
26 <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="125" width="70"/> 29 L$
27 <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="200" width="70"/> 30 </text>
28 <button label="Paga" label_selected="Paga" name="pay btn"/> 31
29 <button label="Cancella" label_selected="Cancella" name="cancel btn"/> 32 <button name="pay btn" label="Paga" />
30 <line_editor left="74" name="amount" width="50" /> 33 <button name="cancel btn" label="Annulla" />
34
31</floater> 35</floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_pay.xml b/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
index 114cb90..93d3c21 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,21 +1,15 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="支払い先: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="支払い" label_selected="支払い" name="pay btn" />
8 <button label="取り消し" label_selected="取り消し" name="cancel btn" />
9 <text type="string" length="1" name="payee_label">
10 支払い先:
11 </text>
12 <text type="string" length="1" name="payee_name">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 一括払い: 5 一括払い:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text"> 7
8 <text name="amount text">
19 金額: 9 金額:
20 </text> 10 </text>
11
12 <button label="支払い" name="pay btn" />
13 <button label="取り消し" name="cancel btn" />
14
21</floater> 15</floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 6ad9c7c..263f7b9 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,30 +1,26 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group"> 3
4 <string name="pay group">
4 グループへの支払い: 5 グループへの支払い:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident"> 7 <string name="pay resident">
7 住人への支払い: 8 住人への支払い:
9 </string>
10
11 <text name="via object">
12 オブジェクトを介して: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label">
13 オブジェクトを介して:
14 </text>
15 <text type="string" length="1" name="object_name_text">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text">
19 一括払い: 16 一括払い:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <text name="amount text">
22 金額: 20 金額:
23 </text> 21 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 22
25 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 23 <button label="支払い" name="pay btn" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" /> 24 <button label="取り消し" name="cancel btn" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" /> 25
28 <button label="支払い" label_selected="支払い" name="pay btn" />
29 <button label="取り消し" label_selected="取り消し" name="cancel btn" />
30</floater> 26</floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_pay.xml b/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
index a76640b..b53b681 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
@@ -1,21 +1,15 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="주민 지불: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="지불" label_selected="지불" name="pay btn" />
8 <button label="취소" label_selected="취소" name="cancel btn" />
9 <text type="string" length="1" name="payee_label">
10 주민 지불:
11 </text>
12 <text type="string" length="1" name="payee_name">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 빠른 지불: 5 빠른 지불:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text"> 7
8 <text name="amount text">
19 금액: 9 금액:
20 </text> 10 </text>
11
12 <button name="pay btn" label="지불" />
13 <button name="cancel btn" label="취소" />
14
21</floater> 15</floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
index 8fa6dff..f57a620 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
@@ -1,30 +1,26 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group"> 3
4 <string name="pay group">
4 그룹 지불: 5 그룹 지불:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident"> 7 <string name="pay resident">
7 주민 지불: 8 주민 지불:
9 </string>
10
11 <text name="via object">
12 매개 오브젝트: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label">
13 매개 오브젝트:
14 </text>
15 <text type="string" length="1" name="object_name_text">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text">
19 빠른 지불: 16 빠른 지불:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <text name="amount text">
22 금액: 20 금액:
23 </text> 21 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 22
25 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 23 <button name="pay btn" label="지불" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" /> 24 <button name="cancel btn" label="취소" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" /> 25
28 <button label="지불" label_selected="지불" name="pay btn" />
29 <button label="취소" label_selected="취소" name="cancel btn" />
30</floater> 26</floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_pay.xml b/linden/indra/newview/skins/default/xui/pl/floater_pay.xml
index 7035890..0a0a445 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_pay.xml
@@ -1,22 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Zapłata dla: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="Zapłać" label_selected="Zapłać" name="pay btn" />
8 <button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
9 <text type="string" length="1" name="payee_label">
10 Zapłata dla:
11 </text>
12 <text type="string" length="1" name="payee_name">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text" halign="left" left="12">
16 Szybka Zapłata: 5 Szybka Zapłata:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text"> 7
8 <button name="fastpay 1" label="L$1" left="115" />
9 <button name="fastpay 5" label="L$5" />
10 <button name="fastpay 10" label="L$10" left="115" />
11 <button name="fastpay 20" label="L$20" />
12
13 <text name="amount text">
19 Suma: 14 Suma:
20 </text> 15 </text>
21 <line_editor left="52" name="amount" /> 16
17 <button name="pay btn" label="Zapłać" />
18 <button name="cancel btn" label="Anuluj" />
19
22</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
index 97c87d5..9d70e4a 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
@@ -1,31 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group" width="100" halign="left"> 3
4 <string name="pay group">
4 Zapłać Grupie: 5 Zapłać Grupie:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident" width="120" halign="left" > 7 <string name="pay resident">
7 Zapłać Rezydentowi: 8 Zapłać Rezydentowi:
9 </string>
10
11 <text name="via object">
12 Poprzez Obiekt: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name" left="125"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label" left="5" width="95" halign="left">
13 Poprzez Obiekt:
14 </text>
15 <text type="string" length="1" name="object_name_text" left="105" >
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text" width="95" halign="left">
19 Szybka Zapłata: 16 Szybka Zapłata:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text" left="5" halign="left"> 18
19 <button name="fastpay 1" label="L$1" left="115" />
20 <button name="fastpay 5" label="L$5" />
21 <button name="fastpay 10" label="L$10" left="115" />
22 <button name="fastpay 20" label="L$20" />
23
24 <text name="amount text">
22 Suma: 25 Suma:
23 </text> 26 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" left="105"/> 27
25 <button label="L$5" label_selected="L$5" name="fastpay 5" left="190"/> 28 <button label="Zapłać" name="pay btn" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" left="105"/> 29 <button label="Anuluj" name="cancel btn" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" left="190"/> 30
28 <button label="Zapłać" label_selected="Zapłać" name="pay btn" />
29 <button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
30 <line_editor left="50" name="amount" width="50" />
31</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_pay.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
index 1bd4c55..588eeaa 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -1,21 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Pagar residente: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" left="112" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text" left="10" width="120">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" left="112" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="Pagar" label_selected="Pagar" name="pay btn" />
8 <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
9 <text type="string" length="1" name="payee_label" width="110" left="5">
10 Pagar residente:
11 </text>
12 <text type="string" length="1" name="payee_name" left="115">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text" width="120" halign="left">
16 Pagamento rápido: 5 Pagamento rápido:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text" left="4" > 7
8 <button name="fastpay 1" label="L$1" left="125" />
9 <button name="fastpay 5" label="L$5" left_delta="80" />
10 <button name="fastpay 10" label="L$10" left="125" />
11 <button name="fastpay 20" label="L$20" left_delta="80" />
12
13 <text name="amount text">
19 Quantia: 14 Quantia:
20 </text> 15 </text>
16
17 <button name="pay btn" label="Pagar" />
18 <button name="cancel btn" label="Cancelar" />
19
21</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index ad76cf8..b5a93f4 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -1,31 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group" width="100" halign="left"> 3
4 <string name="pay group">
4 Pagar Grupo: 5 Pagar Grupo:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident" width="120" halign="left" > 7 <string name="pay resident">
7 Pagar residente: 8 Pagar residente:
9 </string>
10
11 <text name="via object">
12 Via objeto: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name" left="105"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text" left="10" width="120">
11 </text> 16 Pagamento rápido:
12 <text type="string" length="1" name="object_name_label" left="5" width="95" halign="left">
13 Via objeto:
14 </text>
15 <text type="string" length="1" name="object_name_text" left="105" >
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text" width="115" halign="left">
19 Pagamento Rápido:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text" left="5" halign="left"> 18
19 <button name="fastpay 1" label="L$1" left="125" />
20 <button name="fastpay 5" label="L$5" left_delta="80" />
21 <button name="fastpay 10" label="L$10" left="125" />
22 <button name="fastpay 20" label="L$20" left_delta="80" />
23
24 <text name="amount text">
22 Quantia: 25 Quantia:
23 </text> 26 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70"/> 27
25 <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70"/> 28 <button name="pay btn" label="Pagar" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70"/> 29 <button name="cancel btn" label="Cancelar" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70"/> 30
28 <button label="Pagar" label_selected="Pagar" name="pay btn" />
29 <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
30 <line_editor left="60" name="amount" width="50" />
31</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_pay.xml b/linden/indra/newview/skins/default/xui/ru/floater_pay.xml
index ba72d42..259d366 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_pay.xml
@@ -1,22 +1,19 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Заплатить резиденту: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="Платить" label_selected="Платить" name="pay btn" />
8 <button label="Отмена" label_selected="Отмена" name="cancel btn" />
9 <text type="string" length="1" name="payee_label" left="5" width="135">
10 Заплатить резиденту:
11 </text>
12 <text type="string" length="1" name="payee_name" left="145">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text" width="100" halign="left">
16 Быстрая оплата: 5 Быстрая оплата:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text" left="4" > 7
8 <button name="fastpay 1" label="L$1" left="122" />
9 <button name="fastpay 5" label="L$5" />
10 <button name="fastpay 10" label="L$10" left="122" />
11 <button name="fastpay 20" label="L$20" />
12
13 <text name="amount text">
19 Сумма: 14 Сумма:
20 </text> 15 </text>
21 <line_editor left="60" name="amount" width="55"/> 16
17 <button name="pay btn" label="Платить" />
18 <button name="cancel btn" label="Отмена" />
22</floater> 19</floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
index 8c1b192..3e405a7 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
@@ -1,31 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group" width="100" halign="left"> 3
4 <string name="pay group">
4 Платить группе: 5 Платить группе:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident" width="125" halign="left"> 7 <string name="pay resident">
7 Платить резиденту: 8 Платить резиденту:
9 </string>
10
11 <text name="via object">
12 Через объект: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name" left="128"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label" left="5" width="110" halign="left">
13 Через объект:
14 </text>
15 <text type="string" length="1" name="object_name_text" left="128" >
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text" width="115" halign="left">
19 Быстрая оплата: 16 Быстрая оплата:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text" left="5" halign="left" width="85"> 18
22 Количество: 19 <button name="fastpay 1" label="L$1" left="122" />
20 <button name="fastpay 5" label="L$5" />
21 <button name="fastpay 10" label="L$10" left="122" />
22 <button name="fastpay 20" label="L$20" />
23
24 <text name="amount text">
25 Сумма:
23 </text> 26 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70" /> 27
25 <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70" /> 28 <button name="pay btn" label="Платить" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70" /> 29 <button name="cancel btn" label="Отмена" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70" /> 30
28 <button label="Платить" label_selected="Платить" name="pay btn" />
29 <button label="Отмена" label_selected="Отмена" name="cancel btn" />
30 <line_editor left="84" name="amount" width="50" />
31</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_pay.xml b/linden/indra/newview/skins/default/xui/tr/floater_pay.xml
index f40322a..2bb51e2 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_pay.xml
@@ -1,21 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Üyeye öde: [FIRST] [LAST]">
3 <button label="1 L$" label_selected="1 L$" name="fastpay 1" /> 3
4 <button label="5 L$" label_selected="5 L$" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="10 L$" label_selected="10 L$" name="fastpay 10" />
6 <button label="20 L$" label_selected="20 L$" name="fastpay 20" />
7 <button label="Öde" label_selected="Öde" name="pay btn" />
8 <button label="İptal" label_selected="İptal" name="cancel btn" />
9 <text type="string" length="1" name="payee_label">
10 Üyeye öde:
11 </text>
12 <text type="string" length="1" name="payee_name">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 Hızlı öde: 5 Hızlı öde:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text"> 7
8 <button name="fastpay 1" label="1 L$" />
9 <button name="fastpay 5" label="5 L$" />
10 <button name="fastpay 10" label="10 L$" />
11 <button name="fastpay 20" label="20 L$" />
12
13 <text name="amount text">
19 Miktar: 14 Miktar:
20 </text> 15 </text>
16
17 <button name="pay btn" label="Öde" />
18 <button name="cancel btn" label="İptal" />
19
21</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
index 4376390..947ffdf 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
@@ -1,30 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group"> 3
4 <string name="pay group">
4 Gruba öde: 5 Gruba öde:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident"> 7 <string name="pay resident">
7 Üyeye öde: 8 Üyeye öde:
9 </string>
10
11 <text name="via object">
12 Obje ile: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label">
13 Obje ile:
14 </text>
15 <text type="string" length="1" name="object_name_text">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text">
19 Hızlı öde: 16 Hızlı öde:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <button name="fastpay 1" label="1 L$" />
20 <button name="fastpay 5" label="5 L$" />
21 <button name="fastpay 10" label="10 L$" />
22 <button name="fastpay 20" label="20 L$" />
23
24 <text name="amount text">
22 Miktar: 25 Miktar:
23 </text> 26 </text>
24 <button label="1 L$" label_selected="1 L$" name="fastpay 1" /> 27
25 <button label="5 L$" label_selected="5 L$" name="fastpay 5" /> 28 <button name="pay btn" label="Öde" />
26 <button label="10 L$" label_selected="10 L$" name="fastpay 10" /> 29 <button name="cancel btn" label="İptal" />
27 <button label="20 L$" label_selected="20 L$" name="fastpay 20" /> 30
28 <button label="Öde" label_selected="Öde" name="pay btn" />
29 <button label="İptal" label_selected="İptal" name="cancel btn" />
30</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_pay.xml b/linden/indra/newview/skins/default/xui/uk/floater_pay.xml
index f37080b..30490c0 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_pay.xml
@@ -1,22 +1,20 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="Заплатити резиденту: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="Платити" label_selected="Платити" name="pay btn" />
8 <button label="Отмена" label_selected="Отмена" name="cancel btn" />
9 <text type="string" length="1" name="payee_label" left="5" width="135">
10 Заплатити резиденту:
11 </text>
12 <text type="string" length="1" name="payee_name" left="145">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text" width="100" halign="left">
16 Швидка оплата: 5 Швидка оплата:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text" left="4" > 7
8 <button name="fastpay 1" label="L$1" left="115" />
9 <button name="fastpay 5" label="L$5" />
10 <button name="fastpay 10" label="L$10" left="115" />
11 <button name="fastpay 20" label="L$20" />
12
13 <text name="amount text">
19 Сума: 14 Сума:
20 </text> 15 </text>
21 <line_editor left="45" name="amount" width="55"/> 16
17 <button name="pay btn" label="Платити" />
18 <button name="cancel btn" label="Отмена" />
19
22</floater> 20</floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
index b4ded51..80a90e7 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
@@ -1,31 +1,31 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group" width="100" halign="left"> 3
4 <string name="pay group">
4 Платити групі: 5 Платити групі:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident" width="125" halign="left"> 7 <string name="pay resident">
7 Платити резиденту: 8 Платити резиденту:
9 </string>
10
11 <text name="via object">
12 Через об&apos;єкт: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name" left="128"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label" left="5" width="110" halign="left">
13 Через об&apos;єкт:
14 </text>
15 <text type="string" length="1" name="object_name_text" left="128" >
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text" width="115" halign="left">
19 Швидка оплата: 16 Швидка оплата:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text" left="5" halign="left"> 18
22 Кількість: 19 <button name="fastpay 1" label="L$1" left="115" />
20 <button name="fastpay 5" label="L$5" />
21 <button name="fastpay 10" label="L$10" left="115" />
22 <button name="fastpay 20" label="L$20" />
23
24 <text name="amount text">
25 Сума:
23 </text> 26 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70" /> 27
25 <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70" /> 28 <button name="pay btn" label="Платити" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70" /> 29 <button name="cancel btn" label="Отмена" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70" /> 30
28 <button label="Платити" label_selected="Платити" name="pay btn" />
29 <button label="Відміна" label_selected="Відміна" name="cancel btn" />
30 <line_editor left="70" name="amount" width="50" />
31</floater> 31</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
index 2691383..ac30075 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,21 +1,15 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money" title="支付给居民: [FIRST] [LAST]">
3 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 3
4 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 4 <text name="fastpay text">
5 <button label="L$10" label_selected="L$10" name="fastpay 10" />
6 <button label="L$20" label_selected="L$20" name="fastpay 20" />
7 <button label="支付" label_selected="支付" name="pay btn" />
8 <button label="取消" label_selected="取消" name="cancel btn" />
9 <text type="string" length="1" name="payee_label">
10 支付给居民:
11 </text>
12 <text type="string" length="1" name="payee_name">
13 [FIRST] [LAST]
14 </text>
15 <text type="string" length="1" name="fastpay text">
16 快速支付: 5 快速支付:
17 </text> 6 </text>
18 <text type="string" length="1" name="amount text"> 7
8 <text name="amount text">
19 数量: 9 数量:
20 </text> 10 </text>
11
12 <button name="pay btn" label="支付" />
13 <button name="cancel btn" label="取消" />
14
21</floater> 15</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index ec56c65..088eeb2 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -1,30 +1,26 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="Give Money" title=""> 2<floater name="Give Money">
3 <text type="string" length="1" name="payee_group"> 3
4 <string name="pay group">
4 支付给社团: 5 支付给社团:
5 </text> 6 </string>
6 <text type="string" length="1" name="payee_resident"> 7 <string name="pay resident">
7 支付给居民: 8 支付给居民:
9 </string>
10
11 <text name="via object">
12 通过物体: [OBJECT]
8 </text> 13 </text>
9 <text type="string" length="1" name="payee_name"> 14
10 [FIRST] [LAST] 15 <text name="fastpay text">
11 </text>
12 <text type="string" length="1" name="object_name_label">
13 通过物体:
14 </text>
15 <text type="string" length="1" name="object_name_text">
16 ...
17 </text>
18 <text type="string" length="1" name="fastpay text">
19 快速支付: 16 快速支付:
20 </text> 17 </text>
21 <text type="string" length="1" name="amount text"> 18
19 <text name="amount text">
22 数量: 20 数量:
23 </text> 21 </text>
24 <button label="L$1" label_selected="L$1" name="fastpay 1" /> 22
25 <button label="L$5" label_selected="L$5" name="fastpay 5" /> 23 <button name="pay btn" label="支付" />
26 <button label="L$10" label_selected="L$10" name="fastpay 10" /> 24 <button name="cancel btn" label="取消" />
27 <button label="L$20" label_selected="L$20" name="fastpay 20" /> 25
28 <button label="支付" label_selected="支付" name="pay btn" />
29 <button label="取消" label_selected="取消" name="cancel btn" />
30</floater> 26</floater>