dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16074
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-07-10 15:15:32 +0200
message:
  Settings, i18n
modified:
  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/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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	2014-07-10 10:27:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-07-10 13:15:32 +0000
@@ -18,18 +18,20 @@
 portal=Portal
 start_page=Start page
 no_start_page=No start page
-intro_system_general_settings=Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more.
-intro_system_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page.
-intro_system_email_settings=Configure the email SMTP setup with regard to host name, user name and password.
-intro_system_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group.
-intro_system_access_settings=Configure access to the system, like which user role should be used for user self registration.
-intro_system_calendar_settings=Configure system calendar and date format
-system_general_settings=System General Settings
-system_appearance_settings=System Appearance Settings
-system_email_settings=System Email Settings
-system_approval_settings=System Approval Settings
-system_calendar_settings=System Calendar Settings
-system_access_settings=System Access Settings
+intro_general_settings=Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more.
+intro_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page.
+intro_email_settings=Configure the email SMTP setup with regard to host name, user name and password.
+intro_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group.
+intro_access_settings=Configure access to the system, like which user role should be used for user self registration.
+intro_data_synchronization = Configure remote server URL and authentication for automatic synchronization of data.
+intro_calendar_settings=Configure the system calendar and date format. The system supports a wide range of calendars.
+general_settings=General Settings
+appearance_settings=Appearance Settings
+email_settings=Email Settings
+approval_settings=Approval Settings
+calendar_settings=Calendar Settings
+access_settings=Access Settings
+data_synchronization=Data Synchronization
 general=General
 appearance=Appearance
 email=Email
@@ -107,11 +109,9 @@
 custom_login_page_logo=Custom login page logo
 custom_top_menu_logo=Custom top menu logo
 synchronization=Synchronization
-data_synchronization=Data synchronization
 remote_server_url=Remote server URL
 remote_server_username=Remote server username
 remote_server_password=Remote server password
-intro_data_synchronization = A data synchronization with remote server functionality
 recommended=recommended
 put_analytics_in_maintenance_mode=Put analytics in maintenance mode
 returns=returns

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-07-08 00:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-07-10 13:15:32 +0000
@@ -156,7 +156,7 @@
     
     <!-- Synchronization -->
 
-	<action name="synchronizationSettings" class="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction">
+	<action name="systemSynchronizationSettings" class="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-settings/systemSynchronizationSettings.vm</param>
       <param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2014-07-08 00:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2014-07-10 13:15:32 +0000
@@ -1,11 +1,11 @@
 <h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "systemGeneralSettings.action" "system_general_settings" "systemsettings" )
-    #introListImgItem( "systemAppearanceSettings.action" "system_appearance_settings" "systemsettings" )
-    #introListImgItem( "systemEmailSettings.action" "system_email_settings" "systemsettings" )
-    #introListImgItem( "systemAccessSettings.action" "system_access_settings" "systemsettings" )
-    #introListImgItem( "systemApprovalSettings.action" "system_approval_settings" "systemsettings" )
-    #introListImgItem( "systemCalendarSettings.action" "system_calendar_settings" "systemsettings" )
-    #introListImgItem( "synchronizationSettings.action" "data_synchronization" "systemsettings" )
+    #introListImgItem( "systemGeneralSettings.action" "general_settings" "systemsettings" )
+    #introListImgItem( "systemAppearanceSettings.action" "appearance_settings" "systemsettings" )
+    #introListImgItem( "systemEmailSettings.action" "email_settings" "systemsettings" )
+    #introListImgItem( "systemAccessSettings.action" "access_settings" "systemsettings" )
+    #introListImgItem( "systemApprovalSettings.action" "approval_settings" "systemsettings" )
+    #introListImgItem( "systemCalendarSettings.action" "calendar_settings" "systemsettings" )
+    #introListImgItem( "systemSynchronizationSettings.action" "data_synchronization" "systemsettings" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2014-07-08 00:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2014-07-10 13:15:32 +0000
@@ -6,5 +6,5 @@
     <li><a href="systemAccessSettings.action">$i18n.getString( "access" )&nbsp;</a></li>
     <li><a href="systemApprovalSettings.action">$i18n.getString( "approval" )&nbsp;</a></li>
     <li><a href="systemCalendarSettings.action">$i18n.getString( "calendar" )&nbsp;</a></li>
-    <li><a href="synchronizationSettings.action">$i18n.getString( "synchronization" )&nbsp;</a></li>
+    <li><a href="systemSynchronizationSettings.action">$i18n.getString( "synchronization" )&nbsp;</a></li>
 </ul>