dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2885
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-02-21 16:38:50 +0700
message:
  Removed the duplicated translation keys between global and module.
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es_ES.properties
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.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/resources/org/hisp/dhis/settings/i18n_module_es_ES.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/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-web/dhis-web-commons/src/main/resources/i18n_global_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es_ES.properties	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es_ES.properties	2011-02-21 09:38:50 +0000
@@ -191,3 +191,4 @@
 weekday.saturday=S\u00e1bado
 caused_by=Causado por
 weekday.friday=Viernes
+dhis-web-integration=Integraci\u00f3n NHRM
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-12-14 03:56:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2011-02-21 09:38:50 +0000
@@ -48,6 +48,7 @@
 dhis-web-maintenance-user 				= Ng\u01b0\u1eddi d\u00f9ng
 dhis-web-maintenance-dataadmin 			= Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u
 dhis-web-maintenance-settings 			= C\u00e0i \u0111\u1eb7t
+dhis-web-maintenance-patient            = \u0110\u1ed1i t\u01b0\u1edfng th\u1ee5 h\u01b0\u1edfng v\u00e0 C\u00e1c ch\u01b0\u01a1ng tr\u00ecnh
 dhis-web-dataentry 						= Nh\u1eadp d\u1eef li\u1ec7u
 dhis-web-importexport 					= Sao l\u01b0u d\u1eef li\u1ec7u
 dhis-web-datamart 						= T\u1ed5ng h\u1ee3p d\u1eef li\u1ec7u

=== 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	2011-02-18 20:20:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2011-02-21 09:38:50 +0000
@@ -71,24 +71,6 @@
 start_page = Start page
 forum_integration = Forum integration
 no_start_page = No start page
-dhis-web-maintenance-datadictionary = Data Elements and Indicators
-dhis-web-maintenance-dataset = Datasets
-dhis-web-maintenance-organisationunit = Organisation Units
-dhis-web-maintenance-user = Users
-dhis-web-maintenance-dataadmin = Data administration
-dhis-web-maintenance-settings = Settings
-dhis-web-dataentry = Data Entry
-dhis-web-importexport = Import-Export
-dhis-web-datamart = Data Mart
-dhis-web-validationrule = Data Quality
-dhis-web-dashboard = Dashboard
-dhis-web-gis = GIS
-dhis-web-reporting = Reports
-dhis-web-openhealth-integration = Data analysis
-dhis-web-integration = NHRM integration
-dhis-web-reports = NRHM Reports
-dhis-web-dashboard-integration = Dashboard
-dhis-web-jforum-integration = Forum
 report_framework = Report framework
 birt = BIRT
 jasper = Jasper Reports

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_es_ES.properties	2009-05-19 15:29:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_es_ES.properties	2011-02-21 09:38:50 +0000
@@ -5,10 +5,8 @@
 norway=Noruega
 data_dictionary_mode=Modo del diccionario de datos
 title_color=Color de texto del titulo
-dhis-web-jforum-integration=Forum
 zanzibar=Zanzibar
 sort_order=Ordenamiento
-dhis-web-maintenance-dataadmin=Administraci\u00F3n de Datos
 custom=Personalizado
 top_background_color=Color de fondo superior
 save_zero_values=Guardar valores cero para suma de Elementos de Datos agregados
@@ -18,26 +16,23 @@
 save=Guardar
 display_property=Mostrar propiedades
 regular=Regular
-forum_integration=Integraci\u00F3n de Forums
+forum_integration=Integraci\u00f3n de Forums
 code=Codigo
-application_title=Titulo de la aplicaci\u00F3n
-dhis-web-integration=Integraci\u00F3n NHRM
+application_title=Titulo de la aplicaci\u00f3n
 india=India
 dhis-web-dashboard=Graficos
 green=Verde
 help=Ayuda
-dhis-web-importexport=Importar-Exportar
 color_scheme=Esquema de color
 db_language=Idioma de la Base de Datos
-user_settings=Configuraci\u00F3n de usuario
+user_settings=Configuraci\u00f3n de usuario
 mozambique=Mozambique
 no_start_page=Sin pagina inicial
 style=Estilo
 left_background_color=Color de fondo izquierdo
 tajikistan=Tajikistan
 vietnam=Vietnam
-dhis-web-validationrule=Calidad de los Datos
-system_settings=Configuraci\u00F3n del sistema
+system_settings=Configuraci\u00f3n del sistema
 tanzania=Tanzania
 vista=Vista
 extended=Extendido
@@ -48,28 +43,20 @@
 malawi=Malawi
 south_africa_department_of_health=Departamento de Salud de Sudafrica
 blue=Azul
-dhis-web-dashboard-integration=Tablero
-dhis-web-maintenance-dataset=Conjuntos de Datos
 menu_element_color=Color de elemento del menu
 irc=Comite Internacional de Rescate
 ethiopia=Etiopia
 dhis-web-reports=Informes de Kerala
 light_blue=Azul palido
 mali=Mali
-dhis-web-maintenance-organisationunit=Unidades Organizativas
-dhis-web-maintenance-user=Usuarios
-dhis-web-openhealth-integration=Analisis de Datos
 dhis-web-gis=SIG
 active_menu_element_color=Color de elemento activo del menu
 who=OMS
 no_flag=Sin bandera
 settings=Configuraciones
-dhis-web-dataentry=Entrada de Datos
 nigeria=Nigeria
 start_page=Pagina Inicial
-dhis-web-maintenance-settings=Configuraciones
 sierra_leone=Sierra Leona
-dhis-web-maintenance-datadictionary=Elementos de Datos e Indicadores
 background_color_in_menu=Color de fondo en el menu
 zambia=Zambia
 botswana=Bostwana

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-01-25 13:49:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-02-21 09:38:50 +0000
@@ -193,7 +193,6 @@
 excel_importing = Excel Importing
 delete_current_user = Delete Current User
 number_of_orgunit = Number of organisation units
-
 user_group = User Group
 intro_user_group = Create user groups for functionality that should work on a group of users, like notifications.
 user_group_management = User group management