--- ircd-hybrid/trunk/src/conf_parser.y	2013/04/19 19:16:09	1832
+++ ircd-hybrid/trunk/src/conf_parser.y	2013/04/19 19:50:27	1834
@@ -221,6 +221,7 @@ reset_block_state(void)
 %token  MAX_TARGETS
 %token  MAX_TOPIC_LENGTH
 %token  MAX_WATCH
+%token  MESSAGE_LOCALE
 %token  MIN_NONWILDCARD
 %token  MIN_NONWILDCARD_SIMPLE
 %token  MIN_IDLE
@@ -2411,6 +2412,7 @@ general_item:       general_hide_spoof_i
                     general_pace_wait_simple | general_stats_P_oper_only |
                     general_short_motd | general_no_oper_flood |
                     general_true_no_oper_flood | general_oper_pass_resv |
+                    general_message_locale |
                     general_oper_only_umodes | general_max_targets |
                     general_use_egd | general_egdpool_path |
                     general_oper_umodes | general_caller_id_wait |
@@ -2620,6 +2622,17 @@ general_oper_pass_resv: OPER_PASS_RESV '
   ConfigFileEntry.oper_pass_resv = yylval.number;
 };
 
+general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
+{
+  if (conf_parser_ctx.pass == 2)
+  {
+    if (strlen(yylval.string) > LOCALE_LENGTH-2)
+      yylval.string[LOCALE_LENGTH-1] = '\0';
+
+    set_locale(yylval.string);
+  }
+};
+
 general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
 {
   ConfigFileEntry.dots_in_ident = $3;