diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/llfloaterbuyland.cpp
--- a/indra/newview/llfloaterbuyland.cpp	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/llfloaterbuyland.cpp	Fri Aug 05 17:45:32 2011 +0300
@@ -508,7 +508,9 @@ void LLFloaterBuyLandUI::updateCovenantI
 
 		LLIconCtrl* rating_icon = getChild<LLIconCtrl>("rating_icon");
 		LLRect rect = rating_icon->getRect();
-		S32 icon_left_pad = region_name->getRect().mLeft + region_name->getTextBoundingRect().getWidth() + ICON_PAD;
+		S32 region_name_width = llmin(region_name->getRect().getWidth(), region_name->getTextBoundingRect().getWidth());
+		S32 icon_left_pad = region_name->getRect().mLeft + region_name_width + ICON_PAD;
+		region_name->setToolTip(region_name->getText());
 		rating_icon->setRect(rect.setOriginAndSize(icon_left_pad, rect.mBottom, rect.getWidth(), rect.getHeight()));
 
 		switch(sim_access)
@@ -530,6 +532,7 @@ void LLFloaterBuyLandUI::updateCovenantI
 	if (region_type)
 	{
 		region_type->setText(region->getLocalizedSimProductName());
+		region_type->setToolTip(region->getLocalizedSimProductName());
 	}
 	
 	LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
@@ -619,7 +622,8 @@ void LLFloaterBuyLandUI::updateFloaterCo
 void LLFloaterBuyLandUI::updateFloaterEstateName(const std::string& name)
 {
 	LLTextBox* box = getChild<LLTextBox>("estate_name_text");
-	if (box) box->setText(name);
+	box->setText(name);
+	box->setToolTip(name);
 }
 
 void LLFloaterBuyLandUI::updateFloaterLastModified(const std::string& text)
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/da/strings.xml
--- a/indra/newview/skins/default/xui/da/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/da/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1835,7 +1835,7 @@ Prøv venligst om lidt igen.
 	<string name="RegionNoCovenantOtherOwner">
 		Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab.  Kontakt venligst estate ejeren for detaljer om salg.
 	</string>
-	<string name="covenant_last_modified" value="Sidst rettet:"/>
+	<string name="covenant_last_modified" value="Sidst rettet: "/>
 	<string name="none_text" value=" (ingen) "/>
 	<string name="never_text" value=" (aldrig) "/>
 	<string name="GroupOwned">
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/de/strings.xml
--- a/indra/newview/skins/default/xui/de/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/de/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1882,7 +1882,7 @@ Warten Sie kurz und versuchen Sie dann n
 	<string name="RegionNoCovenantOtherOwner">
 		Für diesen Grundbesitz liegt kein Vertrag vor. Das Land auf diesem Grundbesitz wird vom Grundbesitzer und nicht von Linden Lab verkauft.  Für Informationen zum Verkauf setzen Sie sich bitte mit dem Grundbesitzer in Verbindung.
 	</string>
-	<string name="covenant_last_modified" value="Zuletzt geändert:"/>
+	<string name="covenant_last_modified" value="Zuletzt geändert: "/>
 	<string name="none_text" value=" (keiner) "/>
 	<string name="never_text" value=" (nie) "/>
 	<string name="GroupOwned">
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/en/floater_buy_land.xml
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -208,7 +208,7 @@ supports [AMOUNT2] objects
      name="region_name_text"
      top_delta="0"
      use_ellipses="true"
-     width="155">
+     width="150">
         (unknown)
     </text>
     <icon
@@ -240,7 +240,8 @@ supports [AMOUNT2] objects
      left_delta="125"
      name="region_type_text"
      top_delta="0"
-     width="175">
+     use_ellipses="true"
+     width="170">
         (unknown)
     </text>
     <text
@@ -265,7 +266,8 @@ supports [AMOUNT2] objects
      left_delta="125"
      name="estate_name_text"
      top_delta="0"
-     width="175">
+     use_ellipses="true"
+     width="170">
         (unknown)
     </text>
     <text
@@ -290,7 +292,8 @@ supports [AMOUNT2] objects
      left_delta="125"
      name="estate_owner_text"
      top_delta="0"
-     width="175">
+     use_ellipses="true"
+     width="170">
         (unknown)
     </text>
     <text
@@ -348,11 +351,10 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="12"
      layout="topleft"
-     left="500"
      name="covenant_timestamp_text"
-     right="725"
+     right="-15"
      top="175"
-     width="275"
+     width="281"
      word_wrap="true" />
     <text_editor
      type="string"
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/it/strings.xml
--- a/indra/newview/skins/default/xui/it/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/it/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1855,7 +1855,7 @@ Prova ad accedere nuovamente tra un minu
 	<string name="RegionNoCovenantOtherOwner">
 		Non esiste alcun regolamento per questa proprietà. Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab.  Contatta il proprietario del terreno per i dettagli della vendita.
 	</string>
-	<string name="covenant_last_modified" value="Ultima modifica:"/>
+	<string name="covenant_last_modified" value="Ultima modifica: "/>
 	<string name="none_text" value="(nessuno)"/>
 	<string name="never_text" value="(mai)"/>
 	<string name="GroupOwned">
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/nl/strings.xml
--- a/indra/newview/skins/default/xui/nl/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/nl/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1300,9 +1300,7 @@
 	<string name="RegionNoCovenantOtherOwner">
 		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
 	</string>
-	<string name="covenant_last_modified">
-		Laatst bewerkt:
-	</string>
+	<string name="covenant_last_modified" value="Laatst bewerkt: " />
 	<string name="none_text" value="(none)"/>
 	<string name="never_text" value="(never)"/>
 	<string name="GroupOwned">
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/pl/strings.xml
--- a/indra/newview/skins/default/xui/pl/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/pl/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1695,7 +1695,7 @@
 	<string name="RegionNoCovenantOtherOwner">
 		Brak umowy dla tego majątku. Każda posiadłość w tym majątku została sprzedana przez właściciela majątku nie Linden Lab. Skontaktuj się z właścicielem majątku w celu uzuskania szczegółów sprzedaży.
 	</string>
-	<string name="covenant_last_modified" value="Ostatnio modyfikowano:"/>
+	<string name="covenant_last_modified" value="Ostatnio modyfikowano: "/>
 	<string name="none_text" value=" (żadne) "/>
 	<string name="never_text" value=" (nigdy) "/>
 	<string name="GroupOwned">
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/pt/strings.xml
--- a/indra/newview/skins/default/xui/pt/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/pt/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1810,7 +1810,7 @@ Titulares de contas gratuitas não poder
 	<string name="RegionNoCovenantOtherOwner">
 		Não foi definido um contrato para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda.
 	</string>
-	<string name="covenant_last_modified" value="Última modificação:"/>
+	<string name="covenant_last_modified" value="Última modificação: "/>
 	<string name="none_text" value="(nenhum)"/>
 	<string name="never_text" value="(nunca)"/>
 	<string name="GroupOwned">
diff -r 0fd2a1181a96 -r 455443dabd4f indra/newview/skins/default/xui/zh/strings.xml
--- a/indra/newview/skins/default/xui/zh/strings.xml	Thu Aug 04 18:58:21 2011 -0400
+++ b/indra/newview/skins/default/xui/zh/strings.xml	Fri Aug 05 17:45:32 2011 +0300
@@ -1728,7 +1728,7 @@
 	<string name="RegionNoCovenantOtherOwner">
 		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
 	</string>
-	<string name="covenant_last_modified" value="Last Modified:"/>
+	<string name="covenant_last_modified" value="Last Modified: "/>
 	<string name="none_text" value="（無）"/>
 	<string name="never_text" value="（絕不）"/>
 	<string name="GroupOwned">