=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-10-08 07:10:08 +0000
@@ -27,7 +27,7 @@
 
 	$( "#menuDropDownUserSettings" ).click( function()
 		{
-			window.location.href = currentPath + 'userSettings.action' + backURL;
+			window.location.href = currentPath + 'userGeneralSettings.action' + backURL;
 		});
 	
 	$( "#menuDropDownHelpCenter" ).click( function()

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-10-08 07:10:08 +0000
@@ -889,12 +889,6 @@
 
 	<!-- User settings -->
 	
-	<action name="userSettings" class="org.hisp.dhis.commons.action.NoAction">
-	  <result name="success" type="velocity">/main.vm</result>
-	  <param name="page">/dhis-web-commons/settings/index.vm</param>
-	  <param name="menu">/dhis-web-commons/settings/settingsMenu.vm</param>
-	</action>
-	
 		<!-- General settings -->
     <action name="userGeneralSettings" class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction">
       <result name="success" type="velocity">/main.vm</result>

=== 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	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-08 07:10:08 +0000
@@ -315,8 +315,15 @@
 user_settings=User settings
 general=General
 message=Message
+db_language=Database Language
+language=Interface Language
+use_db_locale_no_translation=Use database locale / no translation
+auto_save_data_entry_form=Auto-save data entry form
+style=Style
 user_general_settings=User General Settings
 user_message_settings=User Message Settings
+message_email_notification=Message email notification
+message_sms_notification=Message sms notification
 intro_user_general_settings=Customize the system with user specific settings for locale, style and more.
 intro_user_message_settings=Customize the system with user specific settings for message email and sms notification.
 #-- Change Log------------------------------------------------------------------#

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2012-10-08 07:10:08 +0000
@@ -427,8 +427,16 @@
 update_user_profile_success=Profile \u0111\u00e3 \u0111\u01b0\u1ee3c c\u1eadp nh\u1eadt
 intro_user_general_settings=T\u00f9y bi\u1ebfn h\u1ec7 th\u1ed1ng v\u1edbi c\u00e1c thi\u1ebft l\u1eadp ng\u01b0\u1eddi d\u00f9ng cho \u0111\u1ecbnh v\u1ecb, th\u1ee9 t\u1ef1 s\u1eafp x\u1ebfp, thu\u1ed9c t\u00ednh hi\u1ec3n th\u1ecb, c\u00e1ch th\u1ee9c v\u00e0 h\u01a1n n\u1eefa.
 intro_user_message_settings=T\u00f9y ch\u1ec9nh h\u1ec7 th\u1ed1ng v\u1edbi c\u00e1c c\u00e0i \u0111\u1eb7t c\u1ee5 th\u1ec3 cho ng\u01b0\u1eddi d\u00f9ng \u0111\u1ed1i v\u1edbi c\u00e1c th\u00f4ng b\u00e1o qua th\u01b0 \u0111i\u1ec7n t\u1eed v\u00e0 tin nh\u1eafn sms.
+user_general_settings=C\u00e1c thi\u1ebft l\u1eadp chung cho ng\u01b0\u1eddi d\u00f9ng
 user_message_settings=C\u00e0i \u0111\u1eb7t th\u00f4ng \u0111i\u1ec7p ng\u01b0\u1eddi d\u00f9ng
 settings=C\u00e1c c\u00e0i \u0111\u1eb7t
 user_settings=C\u00e0i \u0111\u1eb7t ng\u01b0\u1eddi d\u00f9ng
 general=Thi\u1ebft l\u1eadp t\u1ed5ng qu\u00e1t
-message=Th\u00f4ng \u0111i\u1ec7p
\ No newline at end of file
+message=Th\u00f4ng \u0111i\u1ec7p
+db_language=Ng\u00f4n ng\u1eef c\u01a1 s\u1edf d\u1eef li\u1ec7u
+language=Ng\u00f4n ng\u1eef giao di\u1ec7n
+message_sms_notification=Th\u00f4ng b\u00e1o sms
+message_email_notification=Th\u00f4ng b\u00e1o tin nh\u1eafn qua th\u01b0 \u0111i\u1ec7n t\u1eed
+use_db_locale_no_translation=D\u00f9ng c\u01a1 s\u1edf d\u1eef li\u1ec7u \u0111\u1ecba ph\u01b0\u01a1ng / kh\u00f4ng bi\u00ean d\u1ecbch
+auto_save_data_entry_form=T\u1ef1 l\u01b0u m\u1eabu nh\u1eadp d\u1eef li\u1ec7u
+style=Ki\u1ec3u
\ No newline at end of file

=== 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-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-10-08 07:10:08 +0000
@@ -1,6 +1,4 @@
 omit_indicators_zero_numerator_data_mart=Omit indicator values with zero numerator value in data mart
-db_language=Database Language
-language=Interface Language
 dashboard_charts_to_display=Dashboard Charts to Display
 code=Code
 system_settings=System settings
@@ -12,8 +10,6 @@
 password=Password
 application_title=Application title
 dhis-web-maintenance-settings=Settings
-settings=Settings
-style=Style
 light_blue=Light Blue
 green=Green
 flag=Flag
@@ -78,7 +74,6 @@
 message=Message
 disable_dataentry_when_dataset_completed=Disable data entry when data set completed
 data_analysis_factor=Data analysis std dev factor
-auto_save_data_entry_form=Auto-save data entry form
 aggregation_strategy=Aggregation strategy
 real_time=Real-time
 batch=Batch
@@ -88,11 +83,8 @@
 feedback_recipients=Feedback recipients
 no_feedback_recipients=No message recipients
 settings_updated=Settings were updated
-message_email_notification=Message email notification
-message_sms_notification=Message sms notification
 completeness_recipients=Completeness notification recipients
 no_completeness_recipients=No completeness recipients
-use_db_locale_no_translation=Use database locale / no translation
 system_overview=System overview
 cache_strategy=Cache strategy
 no_cache=No cache

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties	2012-10-08 07:10:08 +0000
@@ -18,7 +18,6 @@
 data_analysis_factor=Y\u1ebfu t\u1ed1 ph\u00e2n t\u00edch d\u1eef li\u1ec7u
 general_settings=C\u00e0i \u0111\u1eb7t chung
 openhealth=OpenHealth
-style=Ki\u1ec3u
 custom=L\u1ec1 th\u00f3i
 system_identifier=\u0110\u1ecbnh danh h\u1ec7 th\u1ed1ng
 appearance=Thi\u1ebft l\u1eadp giao di\u1ec7n
@@ -57,7 +56,6 @@
 settings_updated=C\u00e1c thi\u1ebft l\u1eadp \u0111\u00e3 \u0111\u01b0\u1ee3c thay \u0111\u1ed5i
 no_flag=Kh\u00f4ng c\u00f3 c\u1edd qu\u1ed1c gia
 jasper=C\u00e1c b\u00e1o c\u00e1o Jasper
-db_language=Ng\u00f4n ng\u1eef c\u01a1 s\u1edf d\u1eef li\u1ec7u
 dashboard_charts_to_display=Bi\u1ec3u \u0111\u1ed3 hi\u1ec3n th\u1ecb \u1edf b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
 dhis-web-gis=B\u1ea3n \u0111\u1ed3 s\u1ed1
 intro_system_general_settings=Thi\u1ebft l\u1eadp h\u1ec7 th\u1ed1ng v\u1ec1 c\u00e1ch th\u1ee9c t\u1ed5ng h\u1ee3p d\u1eef li\u1ec7u, C\u01a1 s\u1edf h\u1ea1 t\u1ea7ng h\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u, C\u01a1 s\u1edf h\u1ea1 t\u1ea7ng h\u00f3a ki\u1ec3u th\u1eddi gian, Kh\u00f3a bi\u1ec3u nh\u1eadp khi ho\u00e0n t\u1ea5t v\u00e0 h\u01a1n n\u1eefa.
@@ -66,7 +64,6 @@
 lesotho=Lesotho
 mozambique=M\u00f4-d\u0103m-b\u00edch
 days_after_period_timeliness=S\u1ed1 ng\u00e0y sau cu\u1ed1i k\u1ef3 \u0111\u1ec3 \u0111\u00e1nh gi\u00e1 th\u1eddi h\u1ea1n nh\u1eadp d\u1eef li\u1ec7u.
-auto_save_data_entry_form=T\u1ef1 l\u01b0u m\u1eabu nh\u1eadp d\u1eef li\u1ec7u
 background_color_in_menu=M\u00e0u n\u1ec1n c\u1ee7a thanh c\u00f4ng c\u1ee5
 set_left_background_color=M\u00e0u n\u1ec1n b\u00ean tr\u00e1i
 feedback_recipients=Ph\u00e0n h\u1ed3i c\u1ee7a ng\u01b0\u1eddi nh\u1eadn
@@ -76,7 +73,6 @@
 cambodia=C\u0103m-pu-chia
 dhis-web-dataentry=Nh\u1eadp d\u1eef li\u1ec7u v\u00e0o
 dhis-web-openhealth-integration=Ph\u00e2n t\u00edch d\u1eef li\u1ec7u
-user_general_settings=C\u00e1c thi\u1ebft l\u1eadp chung cho ng\u01b0\u1eddi d\u00f9ng
 rwanda=Rwanda
 no_completeness_recipients=Ng\u01b0\u1eddi nh\u1eadn ch\u01b0a ho\u00e0n th\u00e0nh
 password=M\u1eadt kh\u1ea9u
@@ -93,7 +89,6 @@
 system_email_settings=C\u00e1c thi\u1ebft l\u1eadp v\u1ec1 th\u01b0 \u0111i\u1ec7n t\u1eed cho h\u1ec7 th\u1ed1ng
 system_appearance_settings=C\u00e1c thi\u1ebft l\u1eadp v\u1ec1 giao di\u1ec7n cho h\u1ec7 th\u1ed1ng
 code=M\u00e3
-intro_user_email_settings=CT\u00f9y bi\u1ebfn h\u1ec7 th\u1ed1ng v\u1edbi c\u00e1c thi\u1ebft l\u1eadp ng\u01b0\u1eddi d\u00f9ng cho cho ph\u00e9p th\u00f4ng b\u00e1o tin nh\u1eafn qua th\u01b0 \u0111i\u1ec7n t\u1eed.
 armenia=Armenia
 intro_system_email_settings=Thi\u1ebft l\u1eadp h\u1ec7 th\u1ed1ng v\u1ec1 th\u01b0 \u0111i\u1ec7n t\u1eed.
 macos=H\u1ec7 \u0111i\u1ec1u h\u00e0nh Mac
@@ -148,9 +143,7 @@
 philippines=Phi-lip-pin
 namibia=Na-mi-bi-a
 data_dictionary_mode=Ch\u1ebf \u0111\u1ed9 t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u
-message_email_notification=Th\u00f4ng b\u00e1o tin nh\u1eafn qua th\u01b0 \u0111i\u1ec7n t\u1eed
 tanzania=Tan-za-ni-a
-language=Ng\u00f4n ng\u1eef giao di\u1ec7n
 ghana=Ga-na
 active_menu_element_color=K\u00edch ho\u1ea1t m\u00e0u c\u1ee7a thanh c\u00f4ng c\u1ee5
 set_menu_element_colour=M\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n
@@ -162,6 +155,4 @@
 norway=Na uy
 togo=T\u00f4-g\u00f4
 flag=C\u1edd qu\u1ed1c gia
-message_sms_notification=Th\u00f4ng b\u00e1o sms
-use_db_locale_no_translation=D\u00f9ng c\u01a1 s\u1edf d\u1eef li\u1ec7u \u0111\u1ecba ph\u01b0\u01a1ng / kh\u00f4ng bi\u00ean d\u1ecbch
 system_overview=System overview
\ No newline at end of file