dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19116
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-05-08 22:26:13 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  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/webapp/dhis-web-maintenance-settings/systemGeneralSettings.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-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2015-04-24 09:45:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2015-05-08 20:26:13 +0000
@@ -112,6 +112,7 @@
 category_option_combo_id_not_numeric=Category option combo identifier must be a number
 data_element_does_not_exist=Identifier does not reference a data element
 category_option_combo_does_not_exist=Identifier does not reference a category option combo
+org_unit_group_does_not_exist=Organisation unit group does not exist
 expression_not_well_formed=Expression is not well formed
 invalid_indicator_denominators=Invalid indicator denominators
 invalid_indicator_numerators=Invalid indicator numerators

=== 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	2015-04-07 09:42:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-05-08 20:26:13 +0000
@@ -126,4 +126,4 @@
 infrastructural_indicators=Infrastructural indicators
 cors_whitelist=CORS Whitelist
 require_authority_to_add_to_view_object_lists=Require authority to add to view object lists
-example=Example
\ No newline at end of file
+for_example=For example
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-03-30 14:50:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-05-08 20:26:13 +0000
@@ -158,7 +158,7 @@
 <div class="settingLabel">$i18n.getString( "server_base_url" )</div>
 
 <div class="setting">
-    <input type="text" id="instanceBaseUrl" name="instanceBaseUrl" placeholder="$i18n.getString( 'example' ): https://apps.dhis2.org/demo"; value="$!keyInstanceBaseUrl"/>
+    <input type="text" id="instanceBaseUrl" name="instanceBaseUrl" placeholder="$i18n.getString( 'for_example' ) https://apps.dhis2.org/demo"; value="$!keyInstanceBaseUrl"/>
 </div>
 
 <div class="settingLabel">$i18n.getString( "google_analytics_ua_key" )</div>