svn merge ^/trunk/blender -r49118:49143
[blender.git] / source / blender / makesrna / intern / rna_userdef.c
index c8784aa997131160fbbbffb879f95ca5cabe074a..53a8616cb85f15e27deaf6c7f11d2e80e2f102de 100644 (file)
@@ -2981,6 +2981,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
                { 8, "FRENCH", 0, "French (Français)", "fr_FR"},
                { 4, "ITALIAN", 0, "Italian (Italiano)", "it_IT"},
                { 2, "JAPANESE", 0, "Japanese (日本語)", "ja_JP"},
                { 8, "FRENCH", 0, "French (Français)", "fr_FR"},
                { 4, "ITALIAN", 0, "Italian (Italiano)", "it_IT"},
                { 2, "JAPANESE", 0, "Japanese (日本語)", "ja_JP"},
+               {12, "PORTUGUESE", 0, "Portuguese (Português)", "pt"},
                {15, "RUSSIAN", 0, "Russian (Русский)", "ru_RU"},
                {13, "SIMPLIFIED_CHINESE", 0, "Simplified Chinese (简体中文)", "zh_CN"},
                { 9, "SPANISH", 0, "Spanish (Español)", "es"},
                {15, "RUSSIAN", 0, "Russian (Русский)", "ru_RU"},
                {13, "SIMPLIFIED_CHINESE", 0, "Simplified Chinese (简体中文)", "zh_CN"},
                { 9, "SPANISH", 0, "Spanish (Español)", "es"},
@@ -3004,7 +3005,6 @@ static void rna_def_userdef_system(BlenderRNA *brna)
                /* using the utf8 flipped form of Persian (فارسی) */
                {26, "PERSIAN", 0, "Persian (ﯽﺳﺭﺎﻓ)", "fa_IR"},
                {19, "POLISH", 0, "Polish (Polski)", "pl_PL"},
                /* using the utf8 flipped form of Persian (فارسی) */
                {26, "PERSIAN", 0, "Persian (ﯽﺳﺭﺎﻓ)", "fa_IR"},
                {19, "POLISH", 0, "Polish (Polski)", "pl_PL"},
-               {12, "BRAZILIAN_PORTUGUESE", 0, "Portuguese (Português)", "pt"},
 /*             {20, "ROMANIAN", 0, "Romanian (Român)", "ro_RO"}, */ /* XXX No po's yet. */
                {17, "SERBIAN", 0, "Serbian (Српски)", "sr_RS"},
                {28, "SERBIAN_LATIN", 0, "Serbian latin (Srpski latinica)", "sr_RS@latin"},
 /*             {20, "ROMANIAN", 0, "Romanian (Român)", "ro_RO"}, */ /* XXX No po's yet. */
                {17, "SERBIAN", 0, "Serbian (Српски)", "sr_RS"},
                {28, "SERBIAN_LATIN", 0, "Serbian latin (Srpski latinica)", "sr_RS@latin"},