Merge w/ trunk: r51141-52085 (Important Note: gameengine and blenderplayer were not merged due to complex differences)

1 files changed, 7 insertions, 0 deletions

diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h
index 278c45dac52..b01ce93cb65 100644
--- a/source/blender/blenfont/BLF_translation.h
+++ b/source/blender/blenfont/BLF_translation.h
@@ -49,9 +49,13 @@ const char *BLF_pgettext(const char *context, const char *message);
 
 /* Search the path directory to the locale files, this try all
  * the case for Linux, Win and Mac.
+ * Also dynamically builds locales and locales' menu from "languages" text file.
  */
 void BLF_lang_init(void);
 
+/* Free languages and locales_menu arrays created by BLF_lang_init. */
+void BLF_lang_free(void);
+
 /* Set the current locale. */
 void BLF_lang_set(const char *);
 /* Get the current locale (short code, e.g. es_ES). */
@@ -60,6 +64,9 @@ const char *BLF_lang_get(void);
 /* Set the current encoding name. */
 void BLF_lang_encoding(const char *str);
 
+/* Get EnumPropertyItem's for translations menu. */
+struct EnumPropertyItem *BLF_RNA_lang_enum_properties(void);
+
 /* translation */
 int BLF_translate_iface(void);
 int BLF_translate_tooltips(void);