dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25265
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12484: Merging last part of SISMA-362
------------------------------------------------------------
revno: 12484
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-07 19:59:52 +0200
message:
Merging last part of SISMA-362
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt_BR.properties
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_pt.properties
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt_BR.properties
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt.properties
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt_BR.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt_BR.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-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-10-07 17:59:52 +0000
@@ -65,6 +65,7 @@
to=To
value_must_number=Value must be an number
value_must_positive_integer=Value must be a positive integer
+value_must_zero_or_positive_integer=Value must be a positive integer or zero.
value_must_negative_integer=Value must be a negative integer
days=days
please_select=Please select
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt.properties 2013-10-07 17:59:52 +0000
@@ -481,6 +481,7 @@
right_value=Valor correcto
specfiy_birth_date_or_age=Especifique a data de nascimento ou a idade
value_must_positive_integer=Valor deve ser um inteiro positivo
+value_must_zero_or_positive_integer=Valor deve ser um inteiro positivo ou zero
longitude=Longitude
selected_orgunit_no_have_any_child=Unidade de organizacional selecionado n\u00E3o t\u00EAm qualquer filho
report_unit=Unidade de relat\u00F3rio
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt_BR.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt_BR.properties 2013-10-07 17:59:52 +0000
@@ -481,6 +481,7 @@
right_value=Valor correcto
specfiy_birth_date_or_age=Especifique a data de nascimento ou a idade
value_must_positive_integer=Valor deve ser um inteiro positivo
+value_must_zero_or_positive_integer=Valor deve ser um inteiro positivo ou zero
longitude=Longitude
selected_orgunit_no_have_any_child=Unidade de organizacional selecionado n\u00E3o t\u00EAm qualquer filho
report_unit=Unidade de relat\u00F3rio
=== 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 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2013-10-07 17:59:52 +0000
@@ -63,6 +63,7 @@
value_must_number=Value must be an number
value_must_positive_integer=Value must be an positive integer
value_must_negative_integer=Value must be an negative integer
+value_must_zero_or_positive_integer=Value must be zero or positive integer
value_is_too_long=Value is too long
field_unallowed_save_zero=This element does not permit 0 values. The original value will not be affected.
datavalue_history=Data value history
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt.properties 2013-10-07 17:59:52 +0000
@@ -74,6 +74,7 @@
see_details=Veja detalhes
at=em
value_must_positive_integer=Valor deve ser um numero positivo inteiro
+value_must_zero_or_positive_integer=Valor deve ser um inteiro positivo ou zero
timestamp=Tempo
select_from_tree=Seleccione a partir da \u00E1rvore do lado esquerdo
incomplete=Incompleto
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt_BR.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt_BR.properties 2013-10-07 17:59:52 +0000
@@ -74,6 +74,7 @@
see_details=Veja detalhes
at=em
value_must_positive_integer=Valor deve ser um numero positivo inteiro
+value_must_zero_or_positive_integer=Valor deve ser um inteiro positivo ou zero
timestamp=Tempo
select_from_tree=Seleccione a partir da \u00E1rvore do lado esquerdo
incomplete=Incompleto
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties 2013-10-07 17:59:52 +0000
@@ -28,6 +28,7 @@
is_invalid_number=is not a valid number
is_invalid_integer=is not a valid integer
is_invalid_positive_integer=is not a valid positive integer
+is_invalid_zero_or_positive_integer=is not a valid zero or positive integer
is_invalid_negative_integer=is not a valid negative integer
is_invalid_name=is not a valid name
is_invalid_name_length=needs to be 7 or more characters
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt.properties 2013-10-07 17:59:52 +0000
@@ -91,6 +91,7 @@
search_user=Pesquisar utilizador por nome
full_name=Nome Completo
is_invalid_positive_integer=n\u00E3o \u00E9 um inteiro positivo v\u00E1lido
+is_invalid_zero_or_positive_integer=n\u00E3o \u00E9 um inteiro positivo v\u00E1lido ou zero
change=Alterar
beneficiary_enrollment=Inscri
enrolled_programs=Programas inscritos
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt_BR.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt_BR.properties 2013-10-07 17:59:52 +0000
@@ -91,6 +91,7 @@
search_user=Pesquisar utilizador por nome
full_name=Nome Completo
is_invalid_positive_integer=n\u00E3o \u00E9 um inteiro positivo v\u00E1lido
+is_invalid_zero_or_positive_integer=n\u00E3o \u00E9 um inteiro positivo v\u00E1lido ou zero
change=Alterar
beneficiary_enrollment=Inscri
enrolled_programs=Programas inscritos
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2013-10-07 17:59:52 +0000
@@ -183,6 +183,7 @@
number_value_type=Number type
int=Integer
positiveNumber=Positive Integer
+zeroPositiveInt=Positive or Zero Integer
negativeNumber=Negative Integer
view_1=View 1
view_2=View 2
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt.properties 2013-10-07 17:59:52 +0000
@@ -203,5 +203,6 @@
intro_data_element=Criar, modificar, exibir e excluir elementos de dados. Elementos de dados s\u00E3o fen\u00F4menos para os quais ser\u00E3o capturados e analisados.
data_element=Elemento de Dados
positiveNumber=Inteiro posetivo
+zeroPositiveInt=Inteiro posetivo ou zero
available_aggregation_levels=N\u00EDveis de agrega\u00E7\u00E3o dispon\u00EDvel
indicator_group_set=Conjunto de grupo de indicador
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt_BR.properties 2013-10-07 17:58:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt_BR.properties 2013-10-07 17:59:52 +0000
@@ -203,5 +203,6 @@
intro_data_element=Criar, modificar, exibir e excluir elementos de dados. Elementos de dados s\u00E3o fen\u00F4menos para os quais ser\u00E3o capturados e analisados.
data_element=Elemento de Dados
positiveNumber=Inteiro posetivo
+zeroPositiveInt=Inteiro posetivo ou zero
available_aggregation_levels=N\u00EDveis de agrega\u00E7\u00E3o dispon\u00EDvel
indicator_group_set=Conjunto de grupo de indicador