merge

indra/newview/skins/default/xui/da/panel_preferences_chat.xml

@@ -71,7 +71,7 @@
 		<combo_box.item label="Magyar (Ungarsk)" name="Hungarian" />
 		<combo_box.item label="Nederlands (Hollandsk)" name="Dutch" />
 		<combo_box.item label="Polski (Polsk)" name="Polish" />
-		<combo_box.item label="Portugués (Portugisisk)" name="Portugese" />
+		<combo_box.item label="Português (Portugisisk)" name="Portugese" />
 		<combo_box.item label="Русский (Russisk)" name="Russian" />
 		<combo_box.item label="Türkçe (Tyrkisk)" name="Turkish" />
 		<combo_box.item label="Українська (Ukrainsk)" name="Ukrainian" />

indra/newview/skins/default/xui/da/panel_preferences_general.xml

@@ -11,7 +11,7 @@
 		<combo_box.item label="Español (Spansk) - Beta" name="Spanish"/>
 		<combo_box.item label="Français (Fransk) - Beta" name="French"/>
 		<combo_box.item label="Polski (Polsk) - Beta" name="Polish"/>
-		<combo_box.item label="Portugués (Portugisisk) - Beta" name="Portugese"/>
+		<combo_box.item label="Português (Portugisisk) - Beta" name="Portugese"/>
 		<combo_box.item label="日本語 (Japansk) - Beta" name="(Japanese)"/>
 	</combo_box>
 	<text name="language_textbox2">

indra/newview/skins/default/xui/en/panel_preferences_chat.xml

@@ -460,7 +460,7 @@
          name="Polish"
          value="pl" />
         <combo_box.item
-         label="Portugués (Portuguese)"
+         label="Português (Portuguese)"
          name="Portugese"
          value="pt" />
         <combo_box.item

indra/newview/skins/default/xui/en/panel_preferences_general.xml

@@ -77,7 +77,7 @@
          value="pl" />
         <combo_box.item
          enabled="true"
-         label="Portugués (Portuguese) - Beta"
+         label="Português (Portuguese) - Beta"
          name="Portugese"
          value="pt" />
         <combo_box.item

indra/newview/skins/default/xui/es/panel_preferences_chat.xml

@@ -71,7 +71,7 @@
 		<combo_box.item name="Hungarian" label="Magyar (Húngaro)" />
 		<combo_box.item name="Dutch" label="Nederlands (Neerlandés)" />
 		<combo_box.item name="Polish" label="Polski (Polaco)" />
-		<combo_box.item name="Portugese" label="Portugués (Portugués)" />
+		<combo_box.item name="Portugese" label="Português (Portugués)" />
 		<combo_box.item name="Russian" label="Русский (Ruso)" />
 		<combo_box.item name="Turkish" label="Türkçe (Turco)" />
 		<combo_box.item name="Ukrainian" label="Українська (Ucraniano)" />

indra/newview/skins/default/xui/es/panel_preferences_general.xml

@@ -13,7 +13,7 @@
 		<combo_box.item label="Italiano - Beta" name="Italian"/>
 		<combo_box.item label="Nederlands (Neerlandés) - Beta" name="Dutch"/>
 		<combo_box.item label="Polski (Polaco) - Beta" name="Polish"/>
-		<combo_box.item label="Portugués (Portugués) - Beta" name="Portugese"/>
+		<combo_box.item label="Português (Portugués) - Beta" name="Portugese"/>
 		<combo_box.item label="日本語 (Japonés) - Beta" name="(Japanese)"/>
 	</combo_box>
 	<text name="language_textbox2">

indra/newview/skins/default/xui/fr/panel_preferences_chat.xml

@@ -71,7 +71,7 @@
 		<combo_box.item name="Hungarian" label="Magyar (Hongrois)" />
 		<combo_box.item name="Dutch" label="Nederlands (Néerlandais)" />
 		<combo_box.item name="Polish" label="Polski (Polonais)" />
-		<combo_box.item name="Portugese" label="Portugués (Portugais)" />
+		<combo_box.item name="Portugese" label="Português (Portugais)" />
 		<combo_box.item name="Russian" label="Русский (Russe)" />
 		<combo_box.item name="Turkish" label="Türkçe (Turc)" />
 		<combo_box.item name="Ukrainian" label="Українська (Ukrainien)" />

indra/newview/skins/default/xui/fr/panel_preferences_general.xml

@@ -13,7 +13,7 @@
 		<combo_box.item label="Italiano (Italien) - Bêta" name="Italian"/>
 		<combo_box.item label="Nederlands (Néerlandais) - Bêta" name="Dutch"/>
 		<combo_box.item label="Polski (Polonais) - Bêta" name="Polish"/>
-		<combo_box.item label="Portugués (Portugais) - Bêta" name="Portugese"/>
+		<combo_box.item label="Português (Portugais) - Bêta" name="Portugese"/>
 		<combo_box.item label="日本語 (Japonais) - Bêta" name="(Japanese)"/>
 	</combo_box>
 	<text name="language_textbox2">

indra/newview/skins/default/xui/it/panel_preferences_chat.xml

@@ -71,7 +71,7 @@
 		<combo_box.item name="Hungarian" label="Magyar (Ungherese)" />
 		<combo_box.item name="Dutch" label="Nederlands (Olandese)" />
 		<combo_box.item name="Polish" label="Polski (Polacco)" />
-		<combo_box.item name="Portugese" label="Portugués (Portoghese)" />
+		<combo_box.item name="Portugese" label="Português (Portoghese)" />
 		<combo_box.item name="Russian" label="Русский (Russo)" />
 		<combo_box.item name="Turkish" label="Türkçe (Turco)" />
 		<combo_box.item name="Ukrainian" label="Українська (Ukraino)" />

indra/newview/skins/default/xui/it/panel_preferences_general.xml

@@ -13,7 +13,7 @@
 		<combo_box.item label="Italiano - Beta" name="Italian"/>
 		<combo_box.item label="Nederlands (Olandese) - Beta" name="Dutch"/>
 		<combo_box.item label="Polski (Polacco) - Beta" name="Polish"/>
-		<combo_box.item label="Portugués (Portoghese) - Beta" name="Portugese"/>
+		<combo_box.item label="Português (Portoghese) - Beta" name="Portugese"/>
 		<combo_box.item label="日本語 (Giapponese) - Beta" name="(Japanese)"/>
 	</combo_box>
 	<text name="language_textbox2">

indra/newview/skins/default/xui/nl/panel_preferences_general.xml

@@ -78,7 +78,7 @@
 		<combo_box.item name="Hungarian" label="Magyar (Hongaars) - Bèta"/>
 		<combo_box.item name="Dutch" label="Nederlands - Bèta"/>
 		<combo_box.item name="Polish" label="Polski (Pools) - Bèta"/>
-		<combo_box.item name="Portugese" label="Portugués (Portugees) - Bèta"/>
+		<combo_box.item name="Portugese" label="Português (Portugees) - Bèta"/>
 		<combo_box.item name="Russian" label="Русский (Russisch) - Bèta"/>
 		<combo_box.item name="Turkish" label="Türkçe (Turks) - Bèta"/>
 		<combo_box.item name="Ukrainian" label="Українська (Oekraïens) - Bèta"/>

indra/newview/skins/default/xui/pl/panel_preferences_chat.xml

@@ -71,7 +71,7 @@
 		<combo_box.item name="Hungarian" label="Magyar (Węgierski)" />
 		<combo_box.item name="Dutch" label="Nederlands (Niderlandzki)" />
 		<combo_box.item name="Polish" label="Polski" />
-		<combo_box.item name="Portugese" label="Portugués (Portugalski)" />
+		<combo_box.item name="Portugese" label="Português (Portugalski)" />
 		<combo_box.item name="Russian" label="Русский (Rosyjski)" />
 		<combo_box.item name="Turkish" label="Türkçe (Turecki)" />
 		<combo_box.item name="Ukrainian" label="Українська (Ukraiński)" />

indra/newview/skins/default/xui/pl/panel_preferences_general.xml

@@ -13,7 +13,7 @@
 		<combo_box.item label="Italiano (Włoski) - Beta" name="Italian"/>
 		<combo_box.item label="Nederlands (Niderlandzki) - Beta" name="Dutch"/>
 		<combo_box.item label="Polski - Beta" name="Polish"/>
-		<combo_box.item label="Portugués (Portugalski) - Beta" name="Portugese"/>
+		<combo_box.item label="Português (Portugalski) - Beta" name="Portugese"/>
 		<combo_box.item label="日本語 (Japoński) - Beta" name="(Japanese)"/>
 	</combo_box>
 	<text name="language_textbox2">