=== 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 2013-02-28 05:17:00 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-03-12 19:32:33 +0000 @@ -583,6 +583,7 @@ armenia bangladesh benin + bhutan botswana burkina_faso burkina_faso_coat_of_arms @@ -611,6 +612,7 @@ mozambique namibia nicaragua + nepal niger nigeria norway === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/bhutan.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/bhutan.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/bhutan.png 2013-03-12 19:32:33 +0000 differ === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/nepal.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/nepal.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/nepal.png 2013-03-12 19:32:33 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-03-11 16:29:33 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-03-12 19:32:33 +0000 @@ -685,3 +685,5 @@ congo_kinshasa=Democratic Republic of the Congo vanuatu=Vanuatu timor_leste=Timor-Leste +bhutan=Bhutan +nepal=Nepal