=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2012-09-24 21:54:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2012-09-25 03:26:14 +0000
@@ -507,14 +507,14 @@
     <property name="flags">
       <list>
         <value>afghanistan</value>      
-	<value>armenia</value>
+		<value>armenia</value>
         <value>bangladesh</value>
         <value>benin</value>
         <value>botswana</value>
         <value>burkina_faso</value>
         <value>burkina_faso_coat_of_arms</value>
-	<value>cambodia</value>
-	<value>china</value>
+		<value>cambodia</value>
+		<value>china</value>
         <value>ethiopia</value>
         <value>gambia</value>
         <value>ghana</value>
@@ -527,8 +527,8 @@
         <value>kenya</value>
         <value>lesotho</value>
         <value>liberia</value>
-	<value>malawi</value>
-	<value>myanmar</value>
+		<value>malawi</value>
+		<value>myanmar</value>
         <value>mali</value>
         <value>mozambique</value>
         <value>namibia</value>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-09-24 15:52:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-09-25 03:26:14 +0000
@@ -21,14 +21,14 @@
 no_flag=No flag
 ethiopia=Ethiopia
 india=India
-irc=International Rescue Committe
+irc=International Rescue Committee
 armenia=Armenia
 malawi=Malawi
 mozambique=Mozambique
 norway=Norway
 uganda=Uganda
 sierra_leone=Sierra Leone
-sierra_leone_coat_of_arms=Sierra Leone Coat of arms
+sierra_leone_coat_of_arms=Sierra Leone Coat of Arms
 south_africa=South Africa
 south_africa_department_of_health=South Africa Department of Health
 tanzania=Tanzania
@@ -48,7 +48,7 @@
 ghana=Ghana
 who=WHO
 burkina_faso=Burkina Faso
-burkina_faso_coat_of_arms=Burkina Faso Coat of arms
+burkina_faso_coat_of_arms=Burkina Faso Coat of Arms
 guinea=Guinea
 guinea_bissau=Guinea Bissau
 liberia=Liberia
@@ -104,4 +104,7 @@
 cache_until_6am_tomorrow=Cache until 6 AM tomorrow
 cache_for_two_weeks=Cache for two weeks
 max_levels_to_offline=Maximum offline organisation unit levels
-phone_number_area_code = Phone number area code
\ No newline at end of file
+phone_number_area_code = Phone number area code
+china=China
+afghanistan=Afghanistan
+myanmar=Myanmar