=== 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	2011-10-07 11:48:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2011-12-09 10:19:39 +0000
@@ -4,7 +4,7 @@
 db_language = Database Language
 display_property = Display Property
 language = Interface Language
-sort_order = Sort Order
+sort_order_property = Sort Order Property
 dashboard_charts_to_display = Dashboard Charts to Display
 code = Code
 system_settings = System settings

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userGeneralSettings.vm	2011-10-06 08:48:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userGeneralSettings.vm	2011-12-09 10:19:39 +0000
@@ -37,7 +37,7 @@
 #end
 </select>
 
-<h4>$i18n.getString( "sort_order" )</h4>
+<h4>$i18n.getString( "sort_order_property" )</h4>
 
 <select id="currentSortOrder" name="currentSortOrder" style="min-width:250px">
 #foreach( $sortOrder in $sortOrders )