From 68a974e337c921a63676d6dc054d9c11ea4cb76d Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 13 Sep 2010 20:28:17 +0100
Subject: Bunch of trivial typo fixes that were bothering me on another branch!

---
 indra/llcommon/llsdserialize.cpp            | 2 +-
 indra/llcommon/llstring.h                   | 2 +-
 indra/newview/llgroupmgr.cpp                | 4 ++--
 indra/newview/llnotificationhandlerutil.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 69e3ff266a..10f460e8a6 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -71,7 +71,7 @@ void LLSDSerialize::serialize(const LLSD& sd, std::ostream& str, ELLSD_Serialize
 		break;
 
 	default:
-		llwarns << "serialize request for unkown ELLSD_Serialize" << llendl;
+		llwarns << "serialize request for unknown ELLSD_Serialize" << llendl;
 	}
 
 	if (f.notNull())
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 88fecb57bf..7e41e787b5 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -435,7 +435,7 @@ LL_COMMON_API bool iswindividual(llwchar elem);
  */
 
 // Make the incoming string a utf8 string. Replaces any unknown glyph
-// with the UNKOWN_CHARACTER. Once any unknown glph is found, the rest
+// with the UNKNOWN_CHARACTER. Once any unknown glyph is found, the rest
 // of the data may not be recovered.
 LL_COMMON_API std::string rawstr_to_utf8(const std::string& raw);
 
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 85e45d012b..7546c070ea 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1175,8 +1175,8 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
 				}
 				else
 				{
-					if (!rd) llwarns << "Received role data for unkown role " << role_id << " in group " << group_id << llendl;
-					if (!md) llwarns << "Received role data for unkown member " << member_id << " in group " << group_id << llendl;
+					if (!rd) llwarns << "Received role data for unknown role " << role_id << " in group " << group_id << llendl;
+					if (!md) llwarns << "Received role data for unknown member " << member_id << " in group " << group_id << llendl;
 				}
 			}
 		}
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index b5683296eb..4231a73af1 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -353,7 +353,7 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
 	if (!gAgent.getGroupData(payload["group_id"].asUUID(), groupData))
 	{
 		llwarns
-						<< "Group notice for unkown group: "
+						<< "Group notice for unknown group: "
 								<< payload["group_id"].asUUID() << llendl;
 		return;
 	}
-- 
cgit v1.2.3


From e5058cdeb3653e47e2b28907324b210cfab92c8f Mon Sep 17 00:00:00 2001
From: eli_linden <eli@lindenlab.com>
Date: Mon, 13 Sep 2010 12:57:44 -0700
Subject: VWR-22975 fix wrong "endonym" for Portuguese language name

---
 indra/newview/skins/default/xui/da/panel_preferences_chat.xml    | 2 +-
 indra/newview/skins/default/xui/da/panel_preferences_general.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml    | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 2 +-
 indra/newview/skins/default/xui/es/panel_preferences_chat.xml    | 2 +-
 indra/newview/skins/default/xui/es/panel_preferences_general.xml | 2 +-
 indra/newview/skins/default/xui/fr/panel_preferences_chat.xml    | 2 +-
 indra/newview/skins/default/xui/fr/panel_preferences_general.xml | 2 +-
 indra/newview/skins/default/xui/it/panel_preferences_chat.xml    | 2 +-
 indra/newview/skins/default/xui/it/panel_preferences_general.xml | 2 +-
 indra/newview/skins/default/xui/nl/panel_preferences_general.xml | 2 +-
 indra/newview/skins/default/xui/pl/panel_preferences_chat.xml    | 2 +-
 indra/newview/skins/default/xui/pl/panel_preferences_general.xml | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 8caf56f47e..bea106bf28 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/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" />
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index e70cb48262..6a85cf4aae 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/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">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 3b05482cb5..31e160ec33 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/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
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index a69e8d29b0..17eebffa02 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/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
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index a2ed7bc8c7..22f967afe6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/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)" />
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index ca157314aa..20109cf2c5 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/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">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 15ed86460d..ed1107f5e6 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/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)" />
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 3245132972..20d5f754ce 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/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">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 48f19c0c27..d28ed41698 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/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)" />
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index e8c826609c..60c4ed5211 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/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">
diff --git a/indra/newview/skins/default/xui/nl/panel_preferences_general.xml b/indra/newview/skins/default/xui/nl/panel_preferences_general.xml
index 9d9010a349..7be570b27f 100644
--- a/indra/newview/skins/default/xui/nl/panel_preferences_general.xml
+++ b/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"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index b9ba148ce7..e980d71ce4 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/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)" />
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index 69686bcdbc..65ea349aec 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/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">
-- 
cgit v1.2.3