=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_en.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_en.properties 2015-10-15 14:07:18 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_en.properties 2015-10-15 23:57:44 +0000 @@ -24,12 +24,12 @@ 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. intro_oauth2_clients=Configure which clients are allowed to access this system using OAuth2. -general_settings=General Settings -appearance_settings=Appearance Settings -email_settings=Email Settings -approval_settings=Approval Settings -calendar_settings=Calendar Settings -access_settings=Access Settings +general_settings=General +appearance_settings=Appearance +email_settings=Email +approval_settings=Approval +calendar_settings=Calendar +access_settings=Access data_synchronization=Data Synchronization general=General appearance=Appearance @@ -109,7 +109,7 @@ uses_image_from=will use image from custom_login_page_logo=Custom login page logo custom_top_menu_logo=Custom top menu logo -synchronization_settings=Synchronization Settings +synchronization_settings=Synchronization oauth2_clients=OAuth2 Clients remote_server_url=Remote server URL remote_server_username=Remote server username @@ -141,9 +141,17 @@ client_secret=Client Secret grant_types=Grant Types redirect_uris=Redirect URIs -weekly=Weekly +Weekly=Weekly yearly=Yearly -import_settings=Data Import Settings +Daily=Daily +Quarterly=Quarterly +Monthly=Monthly +THIS_BIMONTH=This bi-month +THIS_MONTH=This month +THIS_QUARTER=This quarter +THIS_SIX_MONTH=This six-month +THIS_WEEK=This week +import_settings=Data Import require_category_option_combos_to_match=Require category option combos to match category combo of data element require_organisation_units_to_match_assignment=Require organisation units to match assignment of data set require_attribute_option_combos_to_match=Require attribute option combos to match category combo of data set @@ -152,7 +160,7 @@ require_periods_to_match_period_type=Require periods to match period type of data set yyyy-MM-dd=1981-03-31 (yyyy-MM-dd) dd-MM-yyyy=03-31-1981 (dd-MM-yyyy) -server_settings=Server Settings +server_settings=Server level=Level search=Search no_settings_found_that_match=No settings found that match search @@ -161,3 +169,10 @@ 3_months=3 months 6_months=6 months 12_months=12 months +settings_updated=Setting updated +shortname= +one_url_per_line=One URL per line +field_required=This field is required +field_should_be_an_url=This field should contain an URL +field_should_be_an_email=This field should contain an e-mail address +field_should_be_a_number=This field should contain a number === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_fr.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_fr.properties 2015-10-15 14:07:18 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_fr.properties 2015-10-15 23:57:44 +0000 @@ -60,7 +60,7 @@ allows_html=permettre le HTML application_footer=Pied de page de l'application code=Code -approval_settings=Approval settings +approval_settings=Approval macos=Mac OS intro_system_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group. system_approval_settings=System Approval Settings === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_km.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_km.properties 2015-10-15 14:07:18 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_km.properties 2015-10-15 23:57:44 +0000 @@ -1,1 +1,1 @@ -access_settings=Access settings +access_settings=Access === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_lo.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_lo.properties 2015-10-15 14:07:18 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_lo.properties 2015-10-15 23:57:44 +0000 @@ -1,11 +1,11 @@ openid_provider_label=OpenID Provider Label openid_provider=OpenID Provider username=User name -general_settings=General settings -appearance_settings=Appearance settings -approval_settings=Approval settings -calendar_settings=Calendar settings -access_settings=Access settings +general_settings=General +appearance_settings=Appearance +approval_settings=Approval +calendar_settings=Calendar +access_settings=Access date_format=Date Format google_analytics_ua_key=Google Analytics (Universal Analytics) Key omit_indicators_zero_numerator_data_mart=Omit indicator values with zero numerator in data mart @@ -30,7 +30,7 @@ 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. -email_settings=Email Settings +email_settings=Email data_synchronization=Data Synchronization general=General appearance=Appearance @@ -97,7 +97,7 @@ months=Months allow_users_to_grant_own_user_roles=Allow users to grant own user roles object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type -analytics_max_limit=Maximum number of analytics records +analytics_max_limit=Maximum number of analytics records unlimited=Unlimited uses_image_from=will use image from custom_login_page_logo=Custom login page logo @@ -111,3 +111,6 @@ returns=returns test_settings=Test settings hidden=Hidden +server_settings= +active_menu_element_color= +import_settings= === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_vi.properties' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_vi.properties 2015-10-15 14:07:18 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/i18n/module/i18n_module_vi.properties 2015-10-15 23:57:44 +0000 @@ -8,7 +8,7 @@ no_start_page=Kh\u00f4ng c\u00f3 trang nh\u1ea5t dashboard_charts_to_display=Bi\u1ec3u \u0111\u1ed3 hi\u1ec3n th\u1ecb \u1edf b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n email_settings=C\u00e0i \u0111\u1eb7t email -access_settings=Access settings +access_settings=Access code=M\u00e3 appearance=Thi\u1ebft l\u1eadp giao di\u1ec7n email=Thi\u1ebft l\u1eadp giao th\u1ee9c th\u01b0 \u0111i\u1ec7n t\u1eed @@ -29,4 +29,4 @@ no_completeness_recipients=Ng\u01b0\u1eddi nh\u1eadn ch\u01b0a ho\u00e0n th\u00e0nh username=T\u00ean \u0111\u0103ng nh\u1eadp password=M\u1eadt kh\u1ea9u -application_title=Ti\u00eau \u0111\u1ec1 \u1ee9ng d\u1ee5ng +application_title=Ti\u00eau \u0111\u1ec1 \u1ee9ng d\u1ee5ng === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/index.html 2015-10-15 14:07:18 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-settings/index.html 2015-10-15 23:57:44 +0000 @@ -2,16 +2,13 @@