diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-20 07:15:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-20 07:15:20 -0400 |
| commit | 574e24c34e79828a136b1bc26b20ec8cc0405d71 (patch) | |
| tree | 6ff1429b15efc7485c2b5b9d83b6b312ac0bafeb /indra/newview | |
| parent | 86ae50784fe379312f1ec4afd73a70d73d4b7b94 (diff) | |
| parent | c66e04eace3830b59d977e8c161ac7ec0089b9d4 (diff) | |
merge changes for storm-793
Diffstat (limited to 'indra/newview')
20 files changed, 20 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index c3999501eb..3ccdfc036a 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -1335,7 +1335,7 @@ Prøv igen om lidt. </notification> <notification name="ObjectGiveItem"> Et object med navnet <nolink>[OBJECTFROMNAME]</nolink> ejet af [NAME_SLURL] har givet dig denne [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Behold"/> <button name="Discard" text="Smid væk"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index abea3442fa..1971061096 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2432,7 +2432,7 @@ Versuchen Sie es in einigen Minuten erneut. </notification> <notification name="ObjectGiveItem"> Ein Objekt namens <nolink>[OBJECTFROMNAME]</nolink>, das [NAME_SLURL] gehört, hat Ihnen folgende/n/s [OBJECTTYPE] übergeben: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Behalten"/> <button name="Discard" text="Verwerfen"/> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 310616d57e..c9ccd44b83 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5903,7 +5903,7 @@ No valid parcel could be found. name="ObjectGiveItem" type="offer"> An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] has given you this [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button index="0" diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 1a75beed3f..2ec1b333a9 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -2426,7 +2426,7 @@ Por favor, vuelve a intentarlo en unos momentos. </notification> <notification name="ObjectGiveItem"> Un objeto de nombre <nolink>[OBJECTFROMNAME]</nolink>, propiedad de [NAME_SLURL], te ha dado este [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Guardar"/> <button name="Discard" text="Descartar"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index dd8fdaf50e..ef95a1a389 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -2418,7 +2418,7 @@ Veuillez réessayer dans quelques minutes. </notification> <notification name="ObjectGiveItem"> Un objet nommé <nolink>[OBJECTFROMNAME]</nolink> appartenant à [NAME_SLURL] vous a donné un objet de type [OBJECTTYPE] : -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Garder"/> <button name="Discard" text="Jeter"/> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 88625ef4b7..d09f207af2 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -2420,7 +2420,7 @@ Riprova tra qualche istante. </notification> <notification name="ObjectGiveItem"> Un oggetto denominato <nolink>[OBJECTFROMNAME]</nolink> di proprietà di [NAME_SLURL] ti ha dato questo [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Prendi"/> <button name="Discard" text="Rifiuta"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 5f5dad0d3e..6bff82bec4 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -2467,7 +2467,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ </notification> <notification name="ObjectGiveItem"> [NAME_SLURL] が所有する <nolink>[OBJECTFROMNAME]</nolink> という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました： -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="受け取る"/> <button name="Discard" text="破棄"/> diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml index f27b83d3f9..06e6d8ae7a 100644 --- a/indra/newview/skins/default/xui/nl/notifications.xml +++ b/indra/newview/skins/default/xui/nl/notifications.xml @@ -2698,7 +2698,7 @@ Probeer het alstublieft opnieuw over enkele ogenblikken. Geen geldig perceel kon gevonden worden. </notification> <notification name="ObjectGiveItem"> - Een object genaamd <nolink>[OBJECTFROMNAME]</nolink>, eigendom van [NAME_SLURL], heeft u een [OBJECTTYPE] genaamd [ITEM_SLURL] gegeven. + Een object genaamd <nolink>[OBJECTFROMNAME]</nolink>, eigendom van [NAME_SLURL], heeft u een [OBJECTTYPE] genaamd <nolink>[ITEM_SLURL]</nolink> gegeven. <form name="form"> <button name="Keep" text="Behouden"/> <button name="Discard" text="Afwijzen"/> diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index 63f976a314..7d3225ea31 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -2385,7 +2385,7 @@ Spróbuj ponowanie za kilka minut. </notification> <notification name="ObjectGiveItem"> Obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink>, należący do [NAME_SLURL] dał Tobie [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Zachowaj"/> <button name="Discard" text="Wyrzuć"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 0bb02a7199..22de7edfdd 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -2401,7 +2401,7 @@ Por favor, tente novamente em alguns instantes. </notification> <notification name="ObjectGiveItem"> Um objeto chamado <nolink>[OBJECTFROMNAME]</nolink>, de [NAME_SLURL], lhe deu este(a) [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Segure"/> <button name="Discard" text="Descarte"/> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index f819ed35e6..1c89e9b522 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -2418,7 +2418,7 @@ Please try again in a few moments. </notification> <notification name="ObjectGiveItem"> An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] has given you this [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button name="Keep" text="Keep"/> <button name="Discard" text="Discard"/> diff --git a/indra/newview/skins/minimal/xui/da/notifications.xml b/indra/newview/skins/minimal/xui/da/notifications.xml index e77eeee8df..3d003ea3b3 100644 --- a/indra/newview/skins/minimal/xui/da/notifications.xml +++ b/indra/newview/skins/minimal/xui/da/notifications.xml @@ -1327,7 +1327,7 @@ Prøv igen om lidt. No valid parcel could be found. </notification> <notification name="ObjectGiveItem"> - Et objekt ved navn <nolink>[OBJECTFROMNAME]</nolink> ejet af [NAME_SLURL] tilbyder dig [ITEM_SLURL]. For at bruge denne genstand skal du skifte til avanceret tilstand, hvor du kan finde genstanden i din beholdning. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet. + Et objekt ved navn <nolink>[OBJECTFROMNAME]</nolink> ejet af [NAME_SLURL] tilbyder dig <nolink>[ITEM_SLURL]</nolink>. For at bruge denne genstand skal du skifte til avanceret tilstand, hvor du kan finde genstanden i din beholdning. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet. <form name="form"> <button name="Keep" text="Behold genstand"/> <button name="Discard" text="Afvis genstand"/> diff --git a/indra/newview/skins/minimal/xui/de/notifications.xml b/indra/newview/skins/minimal/xui/de/notifications.xml index 1eee1d1c9b..9abf8cdbb9 100644 --- a/indra/newview/skins/minimal/xui/de/notifications.xml +++ b/indra/newview/skins/minimal/xui/de/notifications.xml @@ -9,7 +9,7 @@ </form> </notification> <notification name="ObjectGiveItem"> - Ein Objekt namens <nolink>[OBJECTFROMNAME]</nolink>, das [NAME_SLURL] gehört, bietet Ihnen [ITEM_SLURL] an. Zur Verwendung dieses Artikels müssen Sie in den erweiterten Modus umschalten, wo Sie den Artikel in Ihrem Inventar finden werden. Um in den erweiterten Modus umzuschalten, beenden Sie die Anwendung, starten Sie sie neu und ändern Sie die Moduseinstellung auf dem Anmeldebildschirm. + Ein Objekt namens <nolink>[OBJECTFROMNAME]</nolink>, das [NAME_SLURL] gehört, bietet Ihnen <nolink>[ITEM_SLURL]</nolink> an. Zur Verwendung dieses Artikels müssen Sie in den erweiterten Modus umschalten, wo Sie den Artikel in Ihrem Inventar finden werden. Um in den erweiterten Modus umzuschalten, beenden Sie die Anwendung, starten Sie sie neu und ändern Sie die Moduseinstellung auf dem Anmeldebildschirm. <form name="form"> <button name="Keep" text="Artikel behalten"/> <button name="Discard" text="Artikel ablehnen"/> diff --git a/indra/newview/skins/minimal/xui/en/notifications.xml b/indra/newview/skins/minimal/xui/en/notifications.xml index 84da9472cc..7b7cdb5fc6 100644 --- a/indra/newview/skins/minimal/xui/en/notifications.xml +++ b/indra/newview/skins/minimal/xui/en/notifications.xml @@ -24,7 +24,7 @@ icon="notify.tga" name="ObjectGiveItem" type="offer"> - An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] is offering you [ITEM_SLURL]. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen. + An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] is offering you <nolink>[ITEM_SLURL]</nolink>. Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen. <form name="form"> <button index="0" diff --git a/indra/newview/skins/minimal/xui/es/notifications.xml b/indra/newview/skins/minimal/xui/es/notifications.xml index b08ebb5f76..78b617c429 100644 --- a/indra/newview/skins/minimal/xui/es/notifications.xml +++ b/indra/newview/skins/minimal/xui/es/notifications.xml @@ -9,7 +9,7 @@ </form> </notification> <notification name="ObjectGiveItem"> - Un objeto de nombre <nolink>[OBJECTFROMNAME]</nolink>, propiedad de [NAME_SLURL], te ofrece un/a [ITEM_SLURL]. Para utilizar este ítem, cambia al modo Avanzado y búscalo en el inventario. Para cambiar al modo Avanzado, sal de la aplicación, reiníciala y cambia el ajuste de modo en la pantalla de inicio de sesión. + Un objeto de nombre <nolink>[OBJECTFROMNAME]</nolink>, propiedad de [NAME_SLURL], te ofrece un/a <nolink>[ITEM_SLURL]</nolink>. Para utilizar este ítem, cambia al modo Avanzado y búscalo en el inventario. Para cambiar al modo Avanzado, sal de la aplicación, reiníciala y cambia el ajuste de modo en la pantalla de inicio de sesión. <form name="form"> <button name="Keep" text="Conservar ítem"/> <button name="Discard" text="Rechazar ítem"/> diff --git a/indra/newview/skins/minimal/xui/fr/notifications.xml b/indra/newview/skins/minimal/xui/fr/notifications.xml index 41dd42c39f..05fa03cdc1 100644 --- a/indra/newview/skins/minimal/xui/fr/notifications.xml +++ b/indra/newview/skins/minimal/xui/fr/notifications.xml @@ -9,7 +9,7 @@ </form> </notification> <notification name="ObjectGiveItem"> - Un objet nommé <nolink>[OBJECTFROMNAME]</nolink> appartenant à [NAME_SLURL] vous offre [ITEM_SLURL]. Pour utiliser cet article, vous devez passer en mode Avancé. L'article se trouve dans votre inventaire. Pour changer de mode, quittez l'application, redémarrez-la, puis sélectionnez un autre mode sur l'écran de connexion. + Un objet nommé <nolink>[OBJECTFROMNAME]</nolink> appartenant à [NAME_SLURL] vous offre <nolink>[ITEM_SLURL]</nolink>. Pour utiliser cet article, vous devez passer en mode Avancé. L'article se trouve dans votre inventaire. Pour changer de mode, quittez l'application, redémarrez-la, puis sélectionnez un autre mode sur l'écran de connexion. <form name="form"> <button name="Keep" text="Garder l'article"/> <button name="Discard" text="Refuser l'article"/> diff --git a/indra/newview/skins/minimal/xui/it/notifications.xml b/indra/newview/skins/minimal/xui/it/notifications.xml index 05e13bc4f3..998e38ff5a 100644 --- a/indra/newview/skins/minimal/xui/it/notifications.xml +++ b/indra/newview/skins/minimal/xui/it/notifications.xml @@ -2418,7 +2418,7 @@ Riprova tra qualche istante. Non è stato trovato nessun territorio valido. </notification> <notification name="ObjectGiveItem"> - Un oggetto denominato <nolink>[OBJECTFROMNAME]</nolink> di proprietà di [NAME_SLURL] ti ha offerto [ITEM_SLURL]: Per usare questo oggetto è necessario passare alla modalità Avanzata e cercarlo nell'Inventario. Per passare alla modalità Avanzata, esci e riavvia l'applicazione e cambia le impostazioni della modalità nella schermata di accesso. + Un oggetto denominato <nolink>[OBJECTFROMNAME]</nolink> di proprietà di <nolink>[ITEM_SLURL]</nolink> ti ha offerto [ITEM_SLURL]: Per usare questo oggetto è necessario passare alla modalità Avanzata e cercarlo nell'Inventario. Per passare alla modalità Avanzata, esci e riavvia l'applicazione e cambia le impostazioni della modalità nella schermata di accesso. <form name="form"> <button name="Keep" text="Mantieni oggetto"/> <button name="Discard" text="Rifiuta oggetto"/> diff --git a/indra/newview/skins/minimal/xui/ja/notifications.xml b/indra/newview/skins/minimal/xui/ja/notifications.xml index 6ad0ed1ac6..43934c9317 100644 --- a/indra/newview/skins/minimal/xui/ja/notifications.xml +++ b/indra/newview/skins/minimal/xui/ja/notifications.xml @@ -2465,7 +2465,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ 有効な区画が見つかりませんでした。 </notification> <notification name="ObjectGiveItem"> - [NAME_SLURL] が所有する <nolink>[OBJECTFROMNAME]</nolink> という名前のオブジェクトが、あなたに [ITEM_SLURL] を渡そうとしています。このアイテムを使うにはアドバンスモードへの切り替えが必要です。アドバンスモードでログインしなおすと、あなたの持ち物にこのアイテムが見つかります。アドバンスモードに切り替えるには、このアプリケーションを終了して再起動し、ログイン画面でモード設定を変更してください。 + [NAME_SLURL] が所有する <nolink>[OBJECTFROMNAME]</nolink> という名前のオブジェクトが、あなたに <nolink>[ITEM_SLURL]</nolink> を渡そうとしています。このアイテムを使うにはアドバンスモードへの切り替えが必要です。アドバンスモードでログインしなおすと、あなたの持ち物にこのアイテムが見つかります。アドバンスモードに切り替えるには、このアプリケーションを終了して再起動し、ログイン画面でモード設定を変更してください。 <form name="form"> <button name="Keep" text="アイテムを受け取る"/> <button name="Discard" text="アイテムを拒否する"/> diff --git a/indra/newview/skins/minimal/xui/pl/notifications.xml b/indra/newview/skins/minimal/xui/pl/notifications.xml index 6e62478ed0..6475a37465 100644 --- a/indra/newview/skins/minimal/xui/pl/notifications.xml +++ b/indra/newview/skins/minimal/xui/pl/notifications.xml @@ -2384,7 +2384,7 @@ Spróbuj ponowanie za kilka minut. Nieważana posiadłość. </notification> <notification name="ObjectGiveItem"> - Obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink>, którego właścicielem jest [NAME_SLURL] oferuje Tobie [ITEM_SLURL]. Korzystanie z tego obieku wymaga przelączenia się na tryb zaawansowany, w którym będzie można odszukać obiekt w Twojej Szafie. W celu przełączenia trybu życia na zaawansowany, zamknij i uruchom ponownie aplikację. Przed ponownym zalogowaniem zmień tryb życia na ekranie logowania. + Obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink>, którego właścicielem jest [NAME_SLURL] oferuje Tobie <nolink>[ITEM_SLURL]</nolink>. Korzystanie z tego obieku wymaga przelączenia się na tryb zaawansowany, w którym będzie można odszukać obiekt w Twojej Szafie. W celu przełączenia trybu życia na zaawansowany, zamknij i uruchom ponownie aplikację. Przed ponownym zalogowaniem zmień tryb życia na ekranie logowania. <form name="form"> <button name="Keep" text="Zaakceptuj obiekt"/> <button name="Discard" text="Odrzuć obiekt"/> diff --git a/indra/newview/skins/minimal/xui/pt/notifications.xml b/indra/newview/skins/minimal/xui/pt/notifications.xml index 30ba6f68bf..9e5ff6fe60 100644 --- a/indra/newview/skins/minimal/xui/pt/notifications.xml +++ b/indra/newview/skins/minimal/xui/pt/notifications.xml @@ -9,7 +9,7 @@ </form> </notification> <notification name="ObjectGiveItem"> - Um objeto chamado <nolink>[OBJECTFROMNAME]</nolink>, de [NAME_SLURL], está lhe oferecendo [ITEM_SLURL]. Esta ação requer o modo Avançado. Passe para o modo Avançado e você verá o item em seu Inventário. Para passar para o modo Avançado, feche e reinicialize esse aplicativo e mude o modo (indicado na tela de login). + Um objeto chamado <nolink>[OBJECTFROMNAME]</nolink>, de [NAME_SLURL], está lhe oferecendo <nolink>[ITEM_SLURL]</nolink>. Esta ação requer o modo Avançado. Passe para o modo Avançado e você verá o item em seu Inventário. Para passar para o modo Avançado, feche e reinicialize esse aplicativo e mude o modo (indicado na tela de login). <form name="form"> <button name="Keep" text="Guardar item"/> <button name="Discard" text="Recusar item"/> |