dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12497
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-08 11:51:33 +0200
message:
  Cleanup
removed:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-appmanager.png
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-appmanager.png
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_bi.properties
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_rw.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml


--
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

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-appmanager.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-appmanager.png	2013-06-22 18:22:32 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-appmanager.png	1970-01-01 00:00:00 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-appmanager.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-appmanager.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dhis-web-maintenance-appmanager.png	2013-10-08 09:51:33 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-10-07 09:33:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-10-08 09:51:33 +0000
@@ -85,13 +85,13 @@
 intro_dhis-web-validationrule=Validate and assess data quality using validation rules or statistical methods.
 intro_dhis-web-mapping=Visualize data on maps using polygons, points, symbols in multiple layers.
 intro_dhis-web-reporting=Analyse data and reporting rates using predefined and dynamic report tools.
-intro_dhis-web-light=Access a mobile device optimized version of data entry, messages and analysis.
+intro_dhis-web-light=Access a mobile device optimized version of data entry and analysis.
 intro_dhis-web-mobile=Access a smartphone optimized version of data entry, settings, messages.
 intro_dhis-web-dashboard-integration=Get an overview of favorite charts, reports and maps and view or write messages.
 intro_dhis-web-visualizer=Create dynamic data visualizations for data elements and indicators.
 intro_dhis-web-pivot=Generate flexible pivot tables with data aggregated in all dimensions. 
 intro_dhis-web-sms=Send SMS reminders and notifications as to phones manually or as scheduled tasks.
-intro_dhis-web-spreadsheet-reporting=Generate and import data from reports based on predefined Excel templates.
+intro_dhis-web-spreadsheet-reporting=Generate and import data based on predefined Excel templates.
 
 #-- Intro functions -------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_bi.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_bi.properties	2013-07-02 15:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_bi.properties	2013-10-08 09:51:33 +0000
@@ -1,601 +1,4 @@
 #-- Application name -----------------------------------------------------------#
 
 district_health_information_software=District Health Information Software 2
-
-#-- dhis-wp --------------------------------------------------------------------#
-
-no_page_specified=No page specified
-an_exception_occured=An exception occurred
-exception_explanation_text=Sorry! The system failed to execute the operation. Usually, no data is lost and you can continue working by going back to the previous page. If you wish to report the incident, please save this page by choosing "File -> Save (page as)" in your browser and include the saved page in the report. The problem details are listed below.
-exception=Exception
-caused_by=Caused by
-unknown_source=Unknown source
-logged_in=Logged in
-not_logged_in=Not logged in
-log_out=Log out
-about=About
-access_denied=Access denied
-access_denied_message=You don't have sufficient authority to view this page.
-go_back=Go back
-main_menu=Main menu
-maintenance=Maintenance
-services=Services
-
-#-- dhis-ouwt ------------------------------------------------------------------#
-
-org_unit_tree=Organisation Unit Tree
-specify_organisationunit=Please specify an organisation unit
-cannot_clear_selected_orgunits=Cannot clear the selected organisation units
-locate_organisation_unit_by_name=Locate organisation unit by name
-error_occurred=An error has occurred.
-select_organisationunit=You must select an OrganisationUnit from the tree.
-
-#-- Modules --------------------------------------------------------------------#
-
-dhis-web-maintenance-datadictionary=Data Elements and Indicators
-dhis-web-maintenance-dataset=Data Sets
-dhis-web-maintenance-organisationunit=Organisation Units
-dhis-web-maintenance-user=Users
-dhis-web-maintenance-dataadmin=Data administration
-dhis-web-maintenance-settings=Settings
-dhis-web-maintenance-patient=Persons and Programs
-dhis-web-maintenance-mobile=Mobile configuration
-dhis-web-caseentry=Individual Records
-dhis-web-dataentry=Data Entry
-dhis-web-importexport=Import-Export
-dhis-web-validationrule=Data Quality
-dhis-web-mapping=GIS
-dhis-web-reporting=Reports
-dhis-web-light=Mobile (Light)
-dhis-web-mobile=Mobile (Smartphone)
-dhis-web-dashboard-integration=Dashboard
-dhis-web-visualizer=Data Visualizer
-dhis-web-dashboard=Data Analyser
-dhis-web-integration=NHRM Integration
-dhis-web-reports=NRHM Reports
-dhis-web-dataentry-national=Linelisting Data Entry
-dhis-web-validationrule-local-in=Validation Analysis
-dhis-web-survey=Survey - Target
-dhis-web-spreadsheet-reporting=Spreadsheet Reports
-dhis-web-sms=SMS
-dhis-web-maintenance-in=Configuration
-dhis-web-linelisting-mp=Manpower
-
-#-- Intro ----------------------------------------------------------------------#
-
-intro_dhis-web-maintenance-datadictionary=Maintain data elements, indicators, data dictionaries, categories and groups.
-intro_dhis-web-maintenance-dataset=Maintain data sets, custom forms, sections and compulsory data elements.
-intro_dhis-web-maintenance-organisationunit=Maintain organisation units and its hierarchy, groups and group sets.
-intro_dhis-web-maintenance-user=Maintain users in terms of authorities and passwords, user roles and groups.
-intro_dhis-web-maintenance-dataadmin=Maintain resource tables, check data integrity, see statistics and more.
-intro_dhis-web-maintenance-settings=Maintain user and system settings related to appearance, notifications and more.
-intro_dhis-web-maintenance-patient=Maintain beneficiaries and programs including attributes and identifiers.
-intro_dhis-web-maintenance-mobile=Maintain data sets plus settings for mobile reporting and SMS configuration.
-intro_dhis-web-caseentry=Register beneficiaries, enter data for encounters and events and view reports.
-intro_dhis-web-dataentry=Enter data for forms either on-line or off-line, validate data and view data trends.
-intro_dhis-web-importexport=Import and export data from DHIS or third-party systems using internal and common formats.
-intro_dhis-web-validationrule=Validate and assess data quality using validation rules or statistical methods.
-intro_dhis-web-mapping=Visualize data on maps using polygons, points, symbols with customizable legends.
-intro_dhis-web-reporting=Analyse data using predefined and dynamic report tools and view reporting rates.
-intro_dhis-web-light=Access a mobile device optimized version of data entry, settings, messages and analysis.
-intro_dhis-web-mobile=Access a smartphone optimized version of data entry, settings, messages.
-intro_dhis-web-dashboard-integration=Get an overview of favorite charts, reports and maps and view or write messages.
-intro_dhis-web-visualizer=Produce dynamic data visualizations as charts or tables for data elements and indicators.
-intro_dhis-web-spreadsheet-reporting=Generate and Import data to/from the reports based on the pre-defined Excel template files.
-
-#-- Common ---------------------------------------------------------------------#
-
-details=Details
-show_details=Show details
-hide_details=Hide details
-change_password=Change password
-date_selector=Choose a date
-hide_menu=Hide menu
-show_menu=Show menu
-show_main_menu=Show main menu
-view_home_page=View home page
-view_intepretations=View interpretations
-organisation_unit=Organisation unit
-dataelement=Data element
-start_date=Start date
-end_date=End date
-entry=Entry
-comment=Comment
-operations=Operations
-add_new=Add new
-rename=Rename
-move=Move
-remove=Remove
-required=Required
-all=All
-save=Save
-new=New
-back=Back
-ok=Ok
-cancel=Cancel
-add=Add
-edit=Edit
-update=Update
-delete=Delete
-close=Close
-gender_male=Male
-gender_female=Female
-gender_other=Other
-password=Password
-confirm_password=Confirm password
-mobile_phone=Mobile phone
-create_new_account=Create a new account
-prove_you_are_not_a_robot=Prove you are not a robot
-create=Create
-cant_read_the_words_try_another_one=Can't read the words? Try another one
-restore=Restore
-new_password=New password
-restore_account=Restore account
-account_recovery=Account recovery
-recover=Recover
-code_from_email=Code from email
-password_hint=Minimum 8 characters, 1 upper-case and 1 digit
-optional=Optional
-
-#-- PeriodTypes ----------------------------------------------------------------#
-
-Daily=Daily
-Weekly=Weekly
-Monthly=Monthly
-BiMonthly=Bimonthly
-Quarterly=Quarterly
-SixMonthly=Six-monthly
-Yearly=Yearly
-TwoYearly=Two-yearly
-OnChange=On-change
-Survey=Survey
-Relative=Relative
-FinancialApril=Financial-April
-FinancialJuly=Financial-July
-FinancialOct=Financial-Oct
-
-#-- Period formats - Should not be translated ----------------------------------#
-
-format.Daily.startDate=yyyy-MM-dd
-format.Daily.endDate=
-format.Weekly.startDate=yyyy 'W' w
-format.Weekly.endDate =
-format.Monthly.startDate=MMMM yyyy
-format.Monthly.endDate =
-format.BiMonthly.startDate=MMM 'to '
-format.BiMonthly.endDate=MMM yyyy
-format.Quarterly.startDate=MMM 'to '
-format.Quarterly.endDate=MMM yyyy
-format.SixMonthly.startDate=MMM 'to '
-format.SixMonthly.endDate=MMM yyyy
-format.Yearly.startDate=yyyy
-format.Yearly.endDate =
-format.TwoYearly.startDate=yyyy 'and '
-format.TwoYearly.endDate=yyyy
-format.OnChange.startDate=yyyy-MM-dd '- '
-format.OnChange.endDate=yyyy-MM-dd
-format.Survey.startDate=yyyy-MM-dd
-format.Survey.endDate =
-format.Relative.startDate=yyyy-MM-dd '- '
-format.Relative.endDate=yyyy-MM-dd
-format.FinancialApril.startDate=dd MMM yyyy 'to '
-format.FinancialApril.endDate= dd MMM yyyy
-format.FinancialJuly.startDate=dd MMM yyyy 'to '
-format.FinancialJuly.endDate= dd MMM yyyy
-format.FinancialOct.startDate='FY '
-format.FinancialOct.endDate= yyyy
-
-#-- Months and weeks -----------------------------------------------------------#
-
-month.january=January
-month.february=February
-month.march=March
-month.april=April
-month.may=May
-month.june=June
-month.july=July
-month.august=August
-month.september=September
-month.october=October
-month.november=November
-month.december=December
-
-month.short.january=Jan
-month.short.february=Feb
-month.short.march=Mar
-month.short.april=Apr
-month.short.may=May
-month.short.june=Jun
-month.short.july=Jul
-month.short.august=Aug
-month.short.september=Sep
-month.short.october=Oct
-month.short.november=Nov
-month.short.december=Dec
-
-weekday.monday=Monday
-weekday.tuesday=Tuesday
-weekday.wednesday=Wednesday
-weekday.thursday=Thursday
-weekday.friday=Friday
-weekday.saturday=Saturday
-weekday.sunday=Sunday
-
-weekday.short.monday=Mon
-weekday.short.tuesday=Tue
-weekday.short.wednesday=Wed
-weekday.short.thursday=Thu
-weekday.short.friday=Fri
-weekday.short.saturday=Sat
-weekday.short.sunday=Sun
-
-#-- The translation page ------------------------------------------------------#
-
-translation_translate=Translate
-translation_addlocale=Add locale
-translation_details=Details
-translation_select_locale=[ Select locale ]
-translation_select_ref=[ Select reference ]
-translation_save=Save
-translation_label_id=Id
-translation_label_name=Name
-translation_label_shortName=Short name
-translation_label_description=Description
-translation_label_comment=Comment
-translation_label_region=Region
-translation_label_title=Title
-translation_variant=Variant
-translation_countrycode=Country code
-translation_languagecode=Language code
-translation_label_numerator_description=Numerator description
-translation_label_denominator_description=Denominator description
-translation_locale_added=Added locale
-translation_cancel=Cancel
-translation_add=Add
-translation_locale=Locale
-translation_reference=Reference
-translation_language_must_be_two_chars=Language must be two characters
-translation_country_must_be_two_chars=Country must be two characters
-translation_variant_must_be_specified=Variant must be specified
-translation_locale_already_exists=Locale already exists
-translation_shortname_wellformed=Please verify Letters, Numbers, Underscore and Spaces for short name only
-translation_shortname_length=Shortname's maximum length of 25 charaters
-translation_duplicated_name_with=Sorry! You entered a duplicated name with
-translation_duplicated_shortname_with=Sorry! You entered a duplicated short name with
-
-#-- About ----------------------------------------------------------------------#
-
-version=Version
-build_revision=Build revision
-build_date=Build date
-user_agent=User agent
-external_configuration_directory=External configuration directory
-environment_variable=Environment variable
-database_type=Database type
-database_name=Database name
-database_user=Database user
-not_set=Not set
-current_user=Current user
-dhis2_online=DHIS 2 Online
-home_page=Home Page
-launchpad_site=Launchpad Site
-message_to_the_dhis2_development_team=Message to the DHIS 2 development team
-error_message_stack_trace=Error message / Stack trace
-enter_message=Enter a message
-send=Send
-help=Help
-send_feedback=Send feedback
-system_status=System status
-feedback=Feedback
-intro=Intro
-help_contents=Help Contents
-about_dhis2=About DHIS 2
-user_account=User account
-last_name=Last name
-unknown=Unknown
-java_opts=Java Opts
-java_version=Java version
-java_vendor=Java vendor
-os_name=OS name
-os_architecture=OS architecture
-os_version=OS version
-supportive_software=Supportive Software
-chrome_description=Super fast web browser for all platforms
-foxit_description=Free and simple PDF reader for Windows
-web_browser=Web browser
-pdf_reader=PDF reader
-ireport_description=Report designer for standard reports
-report_designer=Report designer
-my_datamart=MyDatamart
-my_datamart_description=Local data mart for off-line data analysis
-mobile_client=Mobile client
-mobile_client_description=Client for data capture on mobile devices
-web_api=Web API
-system_overview=System Overview
-server_date=Server date
-online_release_page=online release page
-edit_profile=Edit profile
-view_profile=View profile
-profile_details=Profile details
-job_title=Job title
-introduction=Introduction
-gender=Gender
-male=Male
-female=Female
-other=Other
-birthday=Birthday
-nationality=Nationality
-employer=Employer
-education=Education
-interests=Interests
-languages=Languages
-update_user_profile_success=Profile was updated
-settings=Settings
-user_settings=User settings
-general=General
-message=Message
-db_language=Database language
-language=Interface language
-use_db_locale_no_translation=Use database locale / no translation
-auto_save_data_entry_forms=Auto-save data entry forms
-style=Style
-user_general_settings=User General Settings
-user_message_settings=User Message Settings
-enable_message_email_notifications=Enable message email notifications
-enable_message_sms_notifications=Enable message SMS notifications
-intro_user_general_settings=Customize the system with user specific settings for locale, style and more.
-intro_user_message_settings=Customize the system with user specific settings for message email and sms notification.
-light_blue=Light Blue
-green=Green
-india=India
-vietnam=Vietnam
-settings_updated=Settings were updated
-dashboard=Dashboard
-messages=Messages
-interpretations=Interpretations
-interface_style=Interface style
-server_memory=Server memory
-cpu_cores=CPU cores
-
-#-- Change Log------------------------------------------------------------------#
-
-change_log=Change Log
-release=Release
-release_page=online release page
-
-#-- Macros ---------------------------------------------------------------------#
-
-yes=Yes
-no=No
-true=Yes
-false=No
-sum=Sum
-count=Count
-average=Average
-text=Text
-string=String
-int=Number
-number=Number
-date=Date
-yes_no=Yes/No
-bool=Yes/No
-none=None
-yes_only = Yes Only
-
-#-- User account --------------------------------------------------------------#
-
-profile=Profile
-account=Account
-update_user=Update user
-user_account=User Account
-user_name=User name
-old_password=Old password
-new_password=New password
-retype_new_password=Retype new password
-surname=Surname
-first_name=First name
-email=E-mail
-username=Username
-phone_number=Mobile phone number
-organisation_units=Organisation units
-user_roles=User roles
-update_user_success=Account was updated
-wrong_password=Wrong password
-help_center=Help Center
-help_intro_header=Welcome to the DHIS 2 Help Center
-help_intro_text=Please select an item from the menu to the left.
-please_wait_while_the_system_is_processing=Please wait while the system is processing
-
-#-- Contact info ---------------------------------------------------------------#
-
-address=Address
-contact_details=Contact information
-contact_person=Contact person
-
-#-- Form validation messages --------------------------------------------------#
-
-this_field_is_required=This field is required.
-please_fix_this_field=Please fix this field.
-please_enter_a_valid_email_address=Please enter a valid email address.
-please_enter_a_valid_url=Please enter a valid URL.
-please_enter_a_valid_date=Please enter a valid date.
-please_enter_a_valid_date_iso=Please enter a valid date (e.g. 1990-01-01).
-please_enter_a_valid_number=Please enter a valid number.
-please_enter_a_valid_digits=Please enter only digits.
-please_enter_the_equal_values_again=The entered values do not match. Please re-enter the values.
-please_enter_a_value_with_a_valid_expression=Please enter a value with a valid extension.
-first_character_must_be_alphabetical=The first character must be a letter.
-please_enter_no_more_than_n_character=Please enter no more than {0} characters.
-please_enter_at_least_than_n_character=Please enter at least {0} characters.
-please_enter_a_value_between_n_character=Please enter a value between {0} and {1} characters long.
-please_enter_a_value_between_a_and_b=Please enter a value between {0} and {1}.
-please_enter_a_value_less_than_or_equal_to_n=Please enter a value less than or equal to {0}.
-please_enter_a_value_greater_than_or_equal_to_n=Please enter a value greater than or equal to {0}.
-please_enter_a_different_value_to_above=Please enter a different value to above.
-digits_decimal_only_please=Please enter digits only. Three digits before decimal point and two after the decimal point are allowed.
-please_letters_numbers_spaces_underscores_only=Only letters, numbers, spaces and underscores are allowed.
-please_letters_numbers_spaces_or_some_special_chars_only=Only letters, numbers, spaces and the characters \n .,-,(,) are allowed.
-please_enter_a_value_less_than_or_equal_to=Please enter a value less than or equal to {1}
-please_enter_a_value_greater_than_or_equal_to=Please enter a value greater than or equal to {1}
-please_do_not_enter_same_values=Please do not enter same values.
-letters_or_punctuation_only_please=Letters or punctuation only please.
-please_enter_n_words_or_less=Please enter {0} words or less.
-please_enter_at_least_n_words=Please enter at least {0} words.
-please_enter_betwwen_a_and_b_words=Please enter between {0} and {1} words.
-letters_only_please=Letters only please.
-no_white_space_please=No white space please
-no_start_white_space_please=This field cannot start with a space.
-ZIP_code_must_be_in_the_range=Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx
-please_enter_valid_time=Please enter a valid time, between 00:00 and 23:59.
-please_enter_valid_phone_number=Please specify a valid phone number.
-please_enter_at_least_n_character=Please enter at least {0} characters.
-this_date_can_not_be_after_today=This date can not be after today.
-please_fill_out_at_least_one_of_these_fields=Please fill out at least one of these fields.
-please_select_at_least_one_option_for_these_fields=Please select at least one option for these fields.
-password_must_contain_at_least_one_capital_letter_and_one_digit=Password must contain at least one capital letter and one digit.
-only_digits_are_not_allowed=Only digits are not allowed
-closedDate_should_be_greater_than_openDate=The ClosedDate field should be greater than the OpenDate field.
-please_unicode_chars_only=Valid unicode charaters only are allowed.
-unrecognized_coordinate_string=Unrecognized coordinate string
-please_enter_a_letters_or_digits=Please enter letters or digits.
-please_enter_valid_number=Please enter a valid number.
-please_enter_valid_integer=Please enter a valid integer.
-please_enter_valid_positive_integer=Please enter a valid positive integer.
-please_enter_valid_negative_integer=Please enter a valid negative integer.
-
-please_enter_name=Please enter name!
-please_select_period=Please select period!
-please_select_dataset=Please select dataset!
-please_select_dataelement=Please select data element!
-please_select_indicator=Please select indicator!
-please_enter_description=Please enter description!
-delete_confirm=Do you want to delete?
-
-available=Available
-selected=Selected
-error=Error
-warning=Warning
-success=Success
-waiting=Please wait
-expression_not_well_formed=Expression is not well formed
-locate_by_code=Locate by code
-
-select_at_level=Select at level
-unselect_at_level=Un-select at level
-unselect_all=Un-select all
-select_all=Select all
-select_in_group=Select in group
-unselect_in_group=Un-select in group
-select_children=Select children
-unselect_children=Un-select children
-organisation_unit_selection_tree=Organisation Unit Selection
-
-move_selected=Move selected
-remove_selected=Remove selected
-move_all=Move all
-remove_all=Remove all
-
-move_up=Move up
-move_down=Move down
-move_to_top=Move to top
-move_to_bottom=Move to bottom
-
-#-- Paging messages -----------------------------------------------------------#
-
-no_of_pages=No. of pages
-rows_in_page=No. of rows per page
-jump_to_page=Jump to page
-go=Go
-filter_by_name=Filter by name
-filter=Filter
-clear=Clear
-find=Find
-delete_success=Object deleted
-process=Processing...
-
-#-- Export PDF messages -------------------------------------------------------#
-
-get_pdf=Get PDF
-no_item_to_export=There is no item to export
-name=Name
-short_name=Short name
-alternative_name=Alternative name
-code=Code
-description=Description
-opening_date=Opening date
-closed_date=Closed date
-active=Active
-comment=Comment
-type=Type
-value_type=Value Type
-actual=Actual
-target=Target
-percent=Percent
-on_time=On time
-data_dictionary=Data Dictionary
-data_elements=Data elements
-data_sets=Data sets
-indicators=Indicators
-indicator_groups=Indicator groups
-data_element_groups=Data element groups
-data_element_concepts=Data element concepts
-organisation_units=Organisation units
-organisation_unit_groups=Organisation unit groups
-organisation_unit_hierarchy=Organisation unit hierarchy
-validation_rules=Validation rules
-period_type=Period Type
-users=Users
-
-#-- Indicator -----------------------------------------------------------------#
-
-expression=Expression
-left_expression=Left Expression
-right_expression=Right Expression
-indicator_type=Indicator Type
-annualized=Annualized
-aggregation_operator=Aggregation operator
-numerator=Numerator
-numerator_formula=Numerator formula
-numerator_description=Numerator description
-numerator_aggregation_operator=Numerator aggregation operator
-denominator=Denominator
-denominator_formula=Denominator formula
-denominator_description=Denominator description
-denominator_aggregation_operator=Denominator aggregation operator
-expression_is_empty=Expression is empty
-category_option_combo_does_not_exist=Category option combo does not exist
-data_element_does_not_exist=Data element does not exist
-id_not_numeric=Identifier is not numeric
-expression_not_well_formed=Expression is not well-formed
-
-#-- Validation Rule -----------------------------------------------------------#
-
-absolute=Absolute
-statistical=Statistical
-left_side_description=Left side description
-right_side_description=Right side description
-left_side_of_expression=Left side of Expression
-right_side_of_expression=Right side of Expression
-operator=Operator
-equal_to_symbol===
-not_equal_to_symbol=!=
-greater_than_symbol=>
-greater_than_or_equal_to_symbol=>=
-less_than_symbol=<
-less_than_or_equal_to_symbol=<=
-equal_to===
-not_equal_to=!=
-greater_than=>
-greater_than_or_equal_to=>=
-less_than=<
-less_than_or_equal_to=<=
-
-#-- Constant ------------------------------------------------------------------#
-
-constant=Constant
-constants=Constants
-no_constant_to_select=No constants to select
-
-#-- Dynamic Attributes --------------------------------------------------------#
-
-multiple_choice=Multiple Choice
+dhis2=DHIS 2

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_rw.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_rw.properties	2013-07-02 15:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_rw.properties	2013-10-08 09:51:33 +0000
@@ -1,4 +1,4 @@
-dhis-web-maintenance-dataset=Datasets
-dhis-web-caseentry=Name-Based Data Records
-dhis-web-maintenance-patient=Beneficiaries and Programs
-phone_number=Phone number
+#-- Application name -----------------------------------------------------------#
+
+district_health_information_software=District Health Information Software 2
+dhis2=DHIS 2

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-10-06 07:45:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-10-08 09:51:33 +0000
@@ -317,12 +317,8 @@
     </action>
 
     <action name="validateAddUpdateSqlView" class="org.hisp.dhis.dataadmin.action.sqlview.ValidateAddUpdateSqlViewAction">
-      <result name="success" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseSuccess.vm
-      </result>
-      <result name="input" type="velocity-json">
-        /dhis-web-commons/ajax/jsonResponseInput.vm
-      </result>
+      <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+      <result name="input" type="velocity-json">/dhis-web-commons/ajax/jsonResponseInput.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>