From dd1bd943b9b0a91ccd4d7676bba5eb5277bf0fbe Mon Sep 17 00:00:00 2001 From: MaximB ProductEngine Date: Thu, 2 Jan 2014 22:29:46 +0200 Subject: MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint) --- indra/newview/llpreviewtexture.cpp | 3 ++- indra/newview/skins/default/xui/da/strings.xml | 3 ++- indra/newview/skins/default/xui/de/strings.xml | 3 ++- indra/newview/skins/default/xui/en/strings.xml | 1 + indra/newview/skins/default/xui/es/strings.xml | 3 ++- indra/newview/skins/default/xui/fr/strings.xml | 3 ++- indra/newview/skins/default/xui/it/strings.xml | 3 ++- indra/newview/skins/default/xui/ja/strings.xml | 3 ++- indra/newview/skins/default/xui/pl/strings.xml | 1 + indra/newview/skins/default/xui/pt/strings.xml | 3 ++- indra/newview/skins/default/xui/ru/strings.xml | 3 ++- indra/newview/skins/default/xui/tr/strings.xml | 3 ++- 12 files changed, 22 insertions(+), 10 deletions(-) diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 0ef7326678..50af5aea1f 100755 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -131,7 +131,7 @@ BOOL LLPreviewTexture::postBuild() // Fill in ratios list with common aspect ratio values mRatiosList.clear(); - mRatiosList.push_back("Unconstrained"); + mRatiosList.push_back(LLTrans::getString("Unconstrained")); mRatiosList.push_back("1:1"); mRatiosList.push_back("4:3"); mRatiosList.push_back("10:7"); @@ -142,6 +142,7 @@ BOOL LLPreviewTexture::postBuild() // Now fill combo box with provided list LLComboBox* combo = getChild("combo_aspect_ratio"); + combo->removeall(); for (std::vector::const_iterator it = mRatiosList.begin(); it != mRatiosList.end(); ++it) { diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 11d100eeff..74d160dfae 100755 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -1172,7 +1172,8 @@ Prøv venligst om lidt igen. Du har ikke en kopi af denne tekstur i din beholdning - + Ikke låst + diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 4268b95370..082febd709 100755 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -1267,7 +1267,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Sie haben keine Kopie dieser Textur in Ihrem Inventar. - + keines + Einkäufe aus dem Marktplatz erscheinen hier. Sie können diese dann zur Verwendung in Ihr Inventar ziehen. diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 67f75fe1d2..f0ff6d5b88 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2257,6 +2257,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale Error: There was a problem with this item. Try again later. Open landmarks + Unconstrained diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 484511a08b..2b91c542ad 100755 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1252,7 +1252,8 @@ Intenta iniciar sesión de nuevo en unos instantes. Aquí aparecerán algunos de los objetos que recibas, como los regalos Premium. Después puedes arrastrarlos a tu inventario. - + Sin restricciones + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 78d846ff4f..b8721420cb 100755 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1270,7 +1270,8 @@ Veuillez réessayer de vous connecter dans une minute. Les achats que vous avez effectués sur la Place du marché s'affichent ici. Vous pouvez alors les faire glisser vers votre inventaire afin de les utiliser. - + Sans contraintes + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 60ed2b0929..86d7f75b83 100755 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -1261,7 +1261,8 @@ Prova ad accedere nuovamente tra un minuto. Gli acquissti dal mercato verranno mostrati qui. Potrai quindi trascinarli nel tuo inventario per usarli. - + Libero + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index a0f45e5a55..36966d6825 100755 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1270,7 +1270,8 @@ support@secondlife.com にお問い合わせください。 マーケットプレイスで購入した商品はここに表示されます。その後、アイテムをインベントリにドラッグすれば、それらのアイテムを使用できます。 - + 非拘束 + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index f6dec8536b..f86e393646 100755 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -1035,6 +1035,7 @@ Nie posiadasz kopii tej tekstury w Twojej Szafie. + Swobodny diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 2eb4c0a02e..8436452228 100755 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -1216,7 +1216,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para Suas compras do Marketplace aparecerão aqui. Depois, você poderá arrastá-las para seu inventário para usá-las. - + Sem limites + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 0f71edcee0..8faf834f8f 100755 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -1267,7 +1267,8 @@ support@secondlife.com. Здесь будут показаны ваши покупки из торгового центра. Их можно будет перетащить в ваш инвентарь для использования. - + Без ограничения + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index c4b1530b2b..31c5d2d310 100755 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -1267,7 +1267,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin. Pazaryerinda satın aldıklarınız burada görünecektir. Bunları kullanmak için envanterinize sürükleyebilirsiniz. - + Kısıtsız + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ -- cgit v1.2.3