diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
| commit | 446c55538e1fb12d8a1feb541edf99c16bb29121 (patch) | |
| tree | 022ca3c10bd2e0326098719cdffb65f9465ab08f /indra/newview/skins/default/xui/fr/panel_preferences_general.xml | |
| parent | 5476aca88e4b34d4d145f3a0b04fce95402c7b1f (diff) | |
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Diffstat (limited to 'indra/newview/skins/default/xui/fr/panel_preferences_general.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/panel_preferences_general.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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 7c1986a21f..fd1ed4ccfc 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -102,7 +102,7 @@ Portugués (Portugais) - Bêta
</combo_item>
<combo_item length="1" name="Chinese" type="string">
- 汉语/漢語 (Chinois) - Bêta
+ 中文 (简体) (Chinois) - Bêta
</combo_item>
<combo_item length="1" name="(Japanese)" type="string">
日本語 (Japonais) - Bêta
|