dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17482
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-11-16 11:31:19 +0100
message:
  Label typos
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties


--
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-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java	2014-11-14 20:34:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java	2014-11-16 10:31:19 +0000
@@ -154,7 +154,7 @@
         }
         catch ( CacheLoader.InvalidCacheLoadException ex )
         {
-            userApprovalLevel = null; // Google cache doesn't like to cache a null value even when that's what we need.
+            userApprovalLevel = null; // Google cache doesn't like to cache a null value.
         }
         catch ( ExecutionException ex )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json	2014-11-03 10:34:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/en.json	2014-11-16 10:31:19 +0000
@@ -34,7 +34,7 @@
     "remove": "Remove",
     "are_you_sure_to_remove": "Are you sure you want to remove the selected item?",
     "empty_form": "Empty form",
-    "please_fill_at_least_one_dataelement": "Your form is empty. Please fill at least one dataelement.",
+    "please_fill_at_least_one_dataelement": "Your form is empty. Please fill at least one data element.",
     "use_custom_form": "Custom form",
     "use_default_form": "Default form",
     "print_list": "Print list",

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties	2014-11-06 14:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties	2014-11-16 10:31:19 +0000
@@ -215,10 +215,10 @@
 mapvaluetype=Map value type
 dataelement_group=Data el. group
 dataelement=Data element
-parent_orgunit=Parent orgunit
+parent_orgunit=Parent org unit
 delete_map=Delete map
 aggregating_map_values=Aggregating map values..
-loading_geojson=Loading geojson..
+loading_geojson=Loading GeoJSON..
 date_type=Date type
 saved_as_date_type=saved as date type
 start_date=Start date

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-10-24 11:10:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-11-16 10:31:19 +0000
@@ -30,7 +30,7 @@
     "invalid": "Invalid",
     "required": "Required",
     "number_required": "Number required",
-    "date_required": "Date required (yyyy-mm-dd)",
+    "date_required": "Date required",
     "filter": "Filter",
     "search": "Search",
     "_search": "search",  
@@ -81,7 +81,7 @@
     "status": "Status",
     "details": "Details",
     "_details": "details",
-    "created_by": "Registerd by",
+    "created_by": "Registered by",
     "date": "Date",
     "_date": "date",
     "add_new": "Add new",
@@ -125,13 +125,13 @@
     "program_summary_description": "Generate a summary report for a particular program, organisation unit and time frame. The report presents a list of tracked entity instances with the option to drilldown and see actual values",
     "program_statistics_report": "Program Statistics Report",
     "program_statistics": "Program Statistics",
-    "program_statistics_description": "Generate a statistics report for a particular program. The report provides for example an overview of dropouts or completion rates in a given time frame at a particular organisation unit.",
+    "program_statistics_description": "Generate a statistics report for a particular program. The report provides for example an overview of drop-outs or completion rates in a given time frame at a particular organisation unit.",
     "upcoming_events": "Upcoming Events",
     "upcoming_events_description": "Generate a tabular report showing tracked entity instances and their upcoming events for a selected program and time. Searching, sorting and show/hide operations are possible on the columns.",
     "overdue_events": "Overdue Events",
     "overdue_events_description": "Generate a list of events for a selected program. The report displays list of tracked entity instances and their events that are not conducted on time. Filtering and searching is also possible.",
-    "enrollment_stats": "Enrollment statisctics",
-    "event_stats": "Event statisctics",
+    "enrollment_stats": "Enrollment statistics",
+    "event_stats": "Event statistics",
     "upcoming_event": "Upcoming event",
     "legend": "Legend",
     "event_color_legend": "What do the colors mean?",
@@ -143,9 +143,9 @@
     "report": "Report",
     "_report": "report",     
     "visit_schedule": "Visit Schedule",
-    "mark_for_followup": "Mark for followup",
-    "unmark_for_followup": "Remove from followup",
-    "only_marked_for_followup": "Only marked for followup",
+    "mark_for_followup": "Mark for follow-up",
+    "unmark_for_followup": "Remove from follow-up",
+    "only_marked_for_followup": "Only marked for follow-up",
     "registered_data": "Registered data",
     "no_value": "NO_VALUE",
     "no_data_found": "No data found",
@@ -190,7 +190,7 @@
     "reschedule": "Reschedule",
     "rescheduling": "Rescheduling",
     "scheduling_messaging": "Scheduling and Messaging",
-    "not_yet_enrolled_scheduling": "Not yet enrolled. Scheduling not possible.",
+    "not_yet_enrolled_scheduling": "Not yet enrolled, scheduling not possible",
     "schedule_details": "Schedule details",
     "no_event_to_schedule": "No event to schedule",
     "enroll": "Enroll",

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties	2014-11-06 15:44:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties	2014-11-16 10:31:19 +0000
@@ -104,8 +104,8 @@
 em_no_orgunitgroups=Please add at least one organisation unit group.
 et_line_area_categories=Not enough categories selected
 em_line_area_categories=Please select at least two categories for line and area charts.
-et_invalid_uid=Invalid uid
-em_invalid_uid=Please provide a valid chart uid.
+et_invalid_uid=Invalid ID
+em_invalid_uid=Please provide a valid chart ID.
 et_svg_browser=SVG not supported by browser
 em_svg_browser=Please use Chrome, Firefox, Opera or Safari to export images.
 wm_trendline_deactivated=Trend line deactivated

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2014-07-21 09:45:25 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2014-11-16 10:31:19 +0000
@@ -55,14 +55,14 @@
 dataset_is_locked=Data set is locked
 complete=Complete
 incomplete=Incomplete
-confirm_complete=Are you sure this dataset is complete?
+confirm_complete=Are you sure this data set is complete?
 confirm_undo=Are you sure you will undo the registration?
 data_entry=Data Entry
 followup=Follow-up
 validation_rule=Validation rule
-register_complete_dataset_success=Registered complete dataset
-register_complete_dataset_failed=Register complete dataset failed
-undo_register_complete_dataset_success=Undo register complete dataset success
+register_complete_dataset_success=Registered complete data set
+register_complete_dataset_failed=Register complete data set failed
+undo_register_complete_dataset_success=Undo register complete data set success
 datavalue_history=Data value history
 enter_digits=Enter digit only.
 value_must_number=Value must be a number

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2014-11-11 21:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2014-11-16 10:31:19 +0000
@@ -148,7 +148,7 @@
 importing_organisation_unit_relationships=Importing organisation unit relationships
 importing_organisation_unit_groups=Importing organisation unit groups
 importing_organisation_unit_group_members=Importing organisation unit group members
-importing_organisation_unit_group_sets=Importing organistaion unit group sets
+importing_organisation_unit_group_sets=Importing organisation unit group sets
 importing_organisation_unit_group_set_members=Importing organisation unit group set members
 importing_organisation_unit_structures=Importing organisation unit structures
 importing_organisation_unit_relationships=Importing organisation unit relationships
@@ -359,7 +359,7 @@
 sort=Sort
 options=Options
 add_new_filter=Add new Filter
-ad_hoc_export=Ad hoc export
+ad_hoc_export=Ad-hoc export
 create_new_filter=Create new Filter
 filter_sort_order=Filter sort order
 edit_filter=Edit Filter

=== 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	2014-09-30 09:08:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2014-11-16 10:31:19 +0000
@@ -179,7 +179,7 @@
 loading=Loading
 level_must_be_int=Level must be a number
 not_choose_dataset=Please select a data set
-not_choose_organisation=Please select an organsisation unit
+not_choose_organisation=Please select an organisation unit
 generate=Generate
 sql_view_management=SQL View Management
 sql_view=SQL View
@@ -225,7 +225,7 @@
 pruning_interrupted=You must choose the organisation unit has parent to prune. Please try again!
 sqlquery_is_not_allowed=Not allowance to query in the special tables!
 sections_with_invalid_category_combinations=Sections with invalid category combinations
-confirm_delete_sqlview=Do you want to delete this sql view object ?
+confirm_delete_sqlview=Do you want to delete this SQL view object ?
 clear_data_mart=Clear data mart
 rebuild_data_mart_index=Rebuild data mart index
 allow_show_zero=Display zeros
@@ -357,7 +357,7 @@
 edit_option = Edit option
 sort_options = Sort options
 available_options = Available options
-please_select_a_dataset = Please select a dataset
+please_select_a_dataset = Please select a data set
 please_select_an_organisation_unit = Please select an organisation unit
 prev_year = Prev year
 next_year = Next year