diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 69e3ff266a8e62acfa2bf2218f1175b1a4e0fc11..10f460e8a6d0baf2ba038b517d093986659969be 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 88fecb57bf7f9158abb115746bbc569f99e5cf32..7e41e787b52814a97d590cf171463627b6602250 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 85e45d012b5bcf9dfb7eef6b2fe165b835ff30b8..7546c070ea6070559d2a96611d897bc01b419a9b 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 b5683296ebf6c73e047357a20dcc60229ee6c38c..4231a73af1b977479e26c80e796c150bd2247160 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; } 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 8caf56f47eacd9262a16b7925a4676eb42f6056b..bea106bf28c64d37be89f35142c2450de7496885 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 e70cb4826264dc892765c727f2bd013660ced4e7..6a85cf4aae41c6f85f3e01e24bf3f3a32c0aebf7 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 3b05482cb5858013b051a591313c14e92dede77b..31e160ec3347e469b34a4f2e2a1498eb5c69c090 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 a69e8d29b0a8807a7c19190d9827558c70cfa861..17eebffa020775e846bb398ec86e89210431b4ec 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 a2ed7bc8c7213854c1673291dcec4d75996a2326..22f967afe62ba623914b4057f32c58ea072540b3 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 ca157314aa560533faae96108b7a8bd4513ff414..20109cf2c514ba88b5ab0699439b2fc89bddee1b 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 15ed86460d9c0fcc0815a301e350b303f38efaa3..ed1107f5e683f4341f4880834913f04d5417e653 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 32451329725bad803760d57ba18676e5f9a4a3e5..20d5f754cedf4c1328d00380161248868961b5b4 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 48f19c0c2750b61f6aecfc5b6d477aa0537e34a4..d28ed41698e8ec72d788538ea77dc91d66a77323 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 e8c826609ceafc13dbbf476b500759c2af7fedcb..60c4ed5211d4775ebba9699d53acb9c37cca83f0 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 9d9010a34919ac8bea24b5f221a172128d6131fd..7be570b27f35bb957a8e61225ac8bc0176e61a36 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 b9ba148ce737d10082e28bcf8a7e2ec29bd850e4..e980d71ce44423cc18a7fef49822285f5e24b385 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 69686bcdbc280e5cf33bfeb027680a0b5f6396dc..65ea349aec8d4fed29bd2dc86556382211d147bf 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">