=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-06-02 22:11:37 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-06-03 09:27:40 +0000
@@ -773,6 +773,15 @@
less_than=<
less_than_or_equal_to=<=
+and_title=And
+or_title=Or
+equal_to_title=Equal to
+not_equal_to_title=Not equal to
+less_than_title=Less than
+less_than_or_equal_to_title=Less than or equal to
+greater_than_title=Greater than
+greater_than_or_equal_to_title=Greater than or equal to
+
#-- Constant ------------------------------------------------------------------#
constant=Constant
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-06-02 22:11:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm 2015-06-03 09:27:40 +0000
@@ -253,7 +253,17 @@
*
/
+
- -
+ - |
+
+ $i18n.getString( 'and_title' )
+ $i18n.getString( 'or_title' )
+ ==
+ !=
+ <
+ <=
+ >
+ >=
+