=== 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-01-09 14:10:30 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-01-23 09:08:59 +0000 @@ -608,3 +608,67 @@ no_access=None read_access=Read read_write_access=Read / Write + +#-- Countries / flags ---------------------------------------------------------# + +algeria=Algeria +ethiopia=Ethiopia +india=India +irc=International Rescue Committee +armenia=Armenia +malawi=Malawi +mozambique=Mozambique +norway=Norway +uganda=Uganda +sierra_leone=Sierra Leone +sierra_leone_coat_of_arms=Sierra Leone Coat of Arms +south_africa=South Africa +south_africa_department_of_health=South Africa Department of Health +tanzania=Tanzania +vietnam=Vietnam +pepfar=PEPFAR +nigeria=Nigeria +ivory_coast=Ivory Coast +botswana=Botswana +global_fund=Global Fund +zambia=Zambia +tajikistan=Tajikistan +mali=Mali +zanzibar=Zanzibar +swaziland=Swaziland +gambia=Gambia +kenya=Kenya +lesotho=Lesotho +namibia=Namibia +ghana=Ghana +who=WHO +burkina_faso=Burkina Faso +burkina_faso_coat_of_arms=Burkina Faso Coat of Arms +guinea=Guinea +guinea_bissau=Guinea Bissau +liberia=Liberia +rwanda=Rwanda +senegal=Senegal +benin=Benin +bangladesh=Bangladesh +philippines=Philippines +niger=Niger +sri_lanka=Sri Lanka +cambodia=Cambodia +indonesia=Indonesia +zimbabwe=Zimbabwe +togo=Togo +china=China +afghanistan=Afghanistan +myanmar=Myanmar +colombia=Colombia +ecuador=Ecuador +peru=Peru +paraguay=Paraguay +nicaragua=Nicaragua +solomon_islands=Solomon Islands +republic_of_trinidad_and_tobago=Republic of Trinidad & Tobago +congo_brazzaville=Republic of the Congo +congo_kinshasa=Democratic Republic of the Congo +vanuatu=Vanuatu +timor_leste=Timor-Leste === 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 2012-12-19 12:31:08 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es_ES.properties 2013-01-23 09:08:59 +0000 @@ -527,3 +527,61 @@ yes_only=S\u00f3lo Si profile=Perfil account=Cuenta +ethiopia=Etiop\u00eda +india=India +irc=International Rescue Committee +armenia=Armenia +malawi=Malawi +mozambique=Mozambique +norway=Noruega +uganda=Uganda +sierra_leone=Sierra Leona +sierra_leone_coat_of_arms=Sierra Leone Coat of Arms +south_africa=Sud\u00e1frica +south_africa_department_of_health=Departamento de Salud de Sud\u00e1frica +tanzania=Tanzania +vietnam=Vietnam +nigeria=Nigeria +ivory_coast=Costa de Marfil +botswana=Botswana +zambia=Zambia +tajikistan=Tayikistan +mali=Mali +zanzibar=Zanz\u00edbar +swaziland=Suazilandia +gambia=Gambia +kenya=Kenia +lesotho=Lesoto +namibia=Namibia +ghana=Ghana +who=OMS +burkina_faso=Burkina Faso +burkina_faso_coat_of_arms=Burkina Faso Coat of Arms +guinea=Guinea +guinea_bissau=Guinea Bissau +liberia=Liberia +rwanda=Ruanda +senegal=Senegal +benin=Benin +bangladesh=Bangladesh +philippines=Filipinas +niger=N\u00edger +sri_lanka=Sri Lanka +cambodia=Camboya +indonesia=Indonesia +zimbabwe=Zimbabue +togo=Togo +pepfar=PEPFAR +china=China +afghanistan=Afganist\u00e1n +myanmar=Myanmar +colombia=Colombia +ecuador=Ecuador +peru=Per\u00fa +paraguay=Paraguay +nicaragua=Nicaragua +solomon_islands=Islas Salom\u00f3n +republic_of_trinidad_and_tobago=Republica de Trinidad y Tobago +congo_brazzaville=Rep\u00fablica del Congo +congo_kinshasa=Rep\u00fablica Democr\u00e1tica del Congo +vanuatu=Vanuatu === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2012-09-19 15:26:57 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties 2013-01-23 09:08:59 +0000 @@ -358,3 +358,45 @@ help_center=Centre d'aide clear=Effacer Monthly=Mensuel +ethiopia=Ethiopie +india=Inde +irc=Comit\u00e9 de secours international +armenia=Arm\u00e9nie +malawi=Malawi +mozambique=Mozambique +norway=Norv\u00e8ge +uganda=Ouganda +sierra_leone=Sierra Leone +sierra_leone_coat_of_arms=Sierra Leone (Armoiries) +south_africa=Afrique du sud +south_africa_department_of_health=Afrique du sud (D\u00e9partement de la sant\u00e9) +tanzania=Tanzanie +vietnam=Viet Nam +nigeria=Nig\u00e9ria +ivory_coast=C\u00f4te d'Ivoire +botswana=Botswana +zambia=Zambie +tajikistan=Tadjikistan +mali=Mali +zanzibar=Zanzibar +swaziland=Swaziland +gambia=Gambie +kenya=Kenya +lesotho=Lesotho +namibia=Namibie +ghana=Ghana +who=OMS +burkina_faso=Burkina Faso +guinea=Guin\u00e9e +guinea_bissau=Guin\u00e9e Bissau +liberia=Lib\u00e9ria +rwanda=Rwanda +senegal=S\u00e9n\u00e9gal +benin=B\u00e9nin +bangladesh=Bangladesh +philippines=Phlippines +sri_lanka=Sri Lanka +cambodia=Cambodge +indonesia=Indon\u00e9sie +zimbabwe=Zimbabwe +togo=Togo === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_my_MM.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_my_MM.properties 2012-09-19 15:26:57 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_my_MM.properties 2013-01-23 09:08:59 +0000 @@ -388,4 +388,4 @@ month.short.august=\u101e\u103c\u1002\u102f\u1010\u103a help_center=\u1021\u1000\u1030\u1021\u100a\u102e\u1015\u1031\u1038\u101e\u100a\u1037\u103a \u100c\u102c\u1014 clear=\u101b\u103e\u1004\u103a\u1038\u101c\u1004\u103a\u1038\u1015\u102b\u104b -Monthly=\u101c\u1005\u1009\u103a +Monthly=\u101c\u1005\u1009\u103a \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt_PT.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt_PT.properties 2012-11-29 04:57:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt_PT.properties 2013-01-23 09:08:59 +0000 @@ -424,3 +424,44 @@ less_than=< less_than_or_equal_to=<= translation_label_shortname=Nome curto +ethiopia=Eti\u00f3pia +india=\u00cdndia +armenia=Arm\u00eania +malawi=Malawi +mozambique=Mo\u00e7ambique +norway=Noruega +uganda=Uganda +sierra_leone=Serra Leoa +sierra_leone_coat_of_arms=Serra Leoa bras\u00e3o de armas +south_africa=\u00c1frica do Sul +south_africa_department_of_health=\u00c1frica do Sul Departamento de Sa\u00fade +tanzania=Tanz\u00e2nia +vietnam=Vietname +nigeria=Nig\u00e9ria +ivory_coast=Costa do Marfim +botswana=Botswana +zambia=Z\u00e2mbia +tajikistan=Tajiquist\u00e3o +mali=Mali +zanzibar=Zanzibar +swaziland=Suazil\u00e2ndia +gambia=G\u00e2mbia +kenya=Qu\u00eania +lesotho=Lesoto +namibia=Nam\u00edbia +ghana=Gana +who=OMS +burkina_faso=Burkina Faso +guinea=Guin\u00e9 +guinea_bissau=Guin\u00e9-Bissau +liberia=Lib\u00e9ria +rwanda=Ruanda +senegal=Senegal +benin=Benin +bangladesh=Bangladesh +philippines=Filipinas +sri_lanka=Sri Lanka +cambodia=Camboja +indonesia=Indon\u00e9sia +zimbabwe=Zimb\u00e1bue +togo=Togo === 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 2013-01-09 06:50:45 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties 2013-01-23 09:08:59 +0000 @@ -456,4 +456,44 @@ server_memory=B\u1ed9 nh\u1edb m\u00e1y ch\u1ee7 cpu_cores=S\u1ed1 nh\u00e2n CPU home_page=Trang ch\u1ee7 -launchpad_site=Trang Launchpad \ No newline at end of file +launchpad_site=Trang Launchpad +south_africa=Nam Phi +liberia=Liberia +zimbabwe=Zim-ba-gu\u00ea +zambia=Zam-bi-a +gambia=Gam-bi-a +zanzibar=Zanzibar +ivory_coast=B\u1edd bi\u1ec3n ng\u00e0 +mali=Ma-li +ethiopia=E-ti-\u00f4-pi-a +indonesia=In-\u0111\u00f4-n\u00ea-si-a +bangladesh=Bangladesh +sierra_leone=Sierra Leone +south_africa_department_of_health=B\u1ed9 Y t\u1ebf Nam Phi +lesotho=Lesotho +mozambique=M\u00f4-d\u0103m-b\u00edch +benin=Benin +cambodia=C\u0103m-pu-chia +rwanda=Rwanda +sri_lanka=Sri-lan-ka +burkina_faso=Burkina Faso +india=\u1ea4n \u0111\u1ed9 +armenia=Armenia +guinea_bissau=Guinea Bissau +botswana=Botswana +nigeria=Ni-g\u00ea-ri-a +kenya=Ken-za +who=T\u1ed5 ch\u1ee9c Y t\u1ebf th\u1ebf gi\u1edbi +swaziland=Swaziland +sierra_leone_coat_of_arms=Sierra Leone Coat of arms +senegal=Senegal +uganda=U-gan-\u0111a +malawi=Ma-la-gi +guinea=Guinea +vietnam=Vi\u1ec7t nam +namibia=Na-mi-bi-a +philippines=Phi-lip-pin +tanzania=Tan-za-ni-a +ghana=Ga-na +norway=Na uy +togo=T\u00f4-g\u00f4 === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_zh_CN.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_zh_CN.properties 2012-09-24 17:36:50 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_zh_CN.properties 2013-01-23 09:08:59 +0000 @@ -482,4 +482,46 @@ update_user_success=\u6210\u529F\u66F4\u65B0\u4FE1\u606F format.Weekly.endDate= add_new=\u65B0\u589E -=\=\=\=\=\=\= +china=\u4E2D\u56FD +south_africa=\u5357\u975E +liberia=\u5229\u6BD4\u91CC\u4E9A +zimbabwe=\u6D25\u5DF4\u5E03\u97E6 +irc=\u56FD\u9645\u7EA2\u5341\u5B57\u4F1A +zambia=\u8D5E\u6BD4\u4E9A +openhealth=OpenHealth +gambia=\u5188\u6BD4\u4E9A +zanzibar=\u6851\u7ED9\u5DF4\u5C14\u5C9B +ivory_coast=\u79D1\u7279\u8FEA\u74E6 +mali=\u9A6C\u91CC +ethiopia=\u57C3\u585E\u4FC4\u6BD4\u4E9A +indonesia=\u5370\u5C3C +bangladesh=\u5B5F\u52A0\u62C9\u56FD +sierra_leone=\u585E\u62C9\u5229\u6602 +south_africa_department_of_health=\u5357\u975E\u536B\u751F\u90E8\u95E8 +tajikistan=\u5854\u5409\u514B\u65AF\u5854 +lesotho=\u83B1\u7D22\u6258 +mozambique=\u83AB\u6851\u6BD4\u514B +benin=\u8D1D\u5B81 +cambodia=\u67EC\u57D4\u5BE8 +rwanda=\u5362\u65FA\u8FBE +sri_lanka=\u65AF\u91CC\u5170\u5361 +burkina_faso=\u5E03\u5409\u7EB3\u6CD5\u7D22 +india=\u6A58\u7EA2 +burkina_faso_coat_of_arms=\u5E03\u57FA\u7EB3\u6CD5\u7D22 +armenia=\u4E9A\u7F8E\u5C3C\u4E9A +guinea_bissau=\u51E0\u5185\u4E9A\u6BD4\u7ECD +botswana=\u535A\u8328\u74E6\u7EB3 +swaziland=\u65AF\u5A01\u58EB\u5170 +sierra_leone_coat_of_arms=\u585E\u62C9\u5229\u6602\u5C42\u76FE\u5F62\u7EB9\u7AE0 +senegal=\u585E\u5185\u52A0\u5C14 +uganda=\u4E4C\u5E72\u8FBE +niger=\u5C3C\u65E5\u5C14 +malawi=\u9A6C\u62C9\u7EF4 +guinea=\u51E0\u5185\u4E9A +vietnam=\u6DF1\u7EA2 +philippines=\u83F2\u5F8B\u5BBE +namibia=\u7EB3\u7C73\u6BD4\u4E9A +tanzania=\u5766\u6851\u5C3C\u4E9A +ghana=\u52A0\u7EB3 +togo=\u591A\u54E5 +norway=\u632A\u5A01 === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2012-09-12 20:07:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2013-01-23 09:08:59 +0000 @@ -40,6 +40,7 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.i18n.I18n; +import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.user.UserSettingService; import com.opensymphony.xwork2.Action; @@ -68,6 +69,13 @@ { this.userSettingService = userSettingService; } + + private SystemSettingManager systemSettingManager; + + public void setSystemSettingManager( SystemSettingManager systemSettingManager ) + { + this.systemSettingManager = systemSettingManager; + } private DataEntryFormService dataEntryFormService; @@ -142,6 +150,13 @@ { return categoryCombos; } + + private List flags; + + public List getFlags() + { + return flags; + } // ------------------------------------------------------------------------- // Execute @@ -167,6 +182,8 @@ Collections.sort( categoryCombos, IdentifiableObjectNameComparator.INSTANCE ); + flags = systemSettingManager.getFlags(); + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2012-12-14 13:46:47 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2013-01-23 09:08:59 +0000 @@ -158,6 +158,7 @@ scope="prototype"> + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-12-04 15:27:28 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2013-01-23 09:08:59 +0000 @@ -107,4 +107,5 @@ skip_offline=Skip Offline object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type auto_save_data_entry_forms=Auto-save data entry forms -notify_completing_user=Send notification to completing user \ No newline at end of file +notify_completing_user=Send notification to completing user +insert_images=Insert images \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js 2013-01-05 15:22:55 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js 2013-01-23 09:08:59 +0000 @@ -28,6 +28,15 @@ dynamicElementSelector.height( dialog.height() - 120 ); }); + $("#imageDialog").dialog({ + minWidth: 350, + minheight: 263, + position: [20, 50], + zIndex: 10000, + resizable: false, + autoOpen: false + }); + $(":button").button(); $(":submit").button(); @@ -45,6 +54,18 @@ $("#selectionDialog").dialog("open"); }); + $("#imageDialog").bind("dialogopen", function(event, ui) { + $("#insertImagesButton").button("disable"); + }) + + $("#imageDialog").bind("dialogclose", function(event, ui) { + $("#insertImagesButton").button("enable"); + }) + + $("#insertImagesButton").click(function() { + $("#imageDialog").dialog("open"); + }); + $("#startButton").button("option", "icons", { primary: "ui-icon-triangle-1-e" }); $("#startButton").click( showDynamicElementInsert ); $("#doneButton").click( showDynamicElementSelect ); @@ -106,6 +127,8 @@ insertDynamicElement(); } }); + + $("#insertImageButton").click(insertImage); $("#insertButton").button("option", "icons", { primary: "ui-icon-plusthick" }); $("#saveButton").button("option", "icons", { primary: "ui-icon-disk" }); @@ -113,6 +136,7 @@ $("#insertDataElementsButton").button("option", "icons", { primary: "ui-icon-newwin" }); $("#cancelButton").button("option", "icons", { primary: "ui-icon-cancel" }); $("#delete").button("option", "icons", { primary: "ui-icon-trash" }); + $("#insertImageButton").button("option", "icons", { primary: "ui-icon-plusthick" }); $("#dataElementsFilterButton").button({ icons: { @@ -192,8 +216,9 @@ dataSetId: dataSetId } }); - + $("#dynamicElementSelector").dblclick(insertDynamicElement); + $("#imageSelector").dblclick(insertImage); if( autoSave ) { @@ -430,6 +455,13 @@ } ); } +function insertImage() { + var image = $("#imageDialog :selected").val(); + var html = ""; + var oEditor = $("#designTextarea").ckeditorGet(); + oEditor.insertHtml( html ); +} + function checkExisted(id) { var result = false; var html = $("#designTextarea").ckeditorGet().getData(); @@ -444,15 +476,13 @@ function setAutoSaveSetting(_autoSave) { - jQuery.postJSON("setAutoSaveSetting.action",{autoSave:_autoSave}, - function(json) - { - autoSave = _autoSave; - if(_autoSave){ - window.setTimeout( "validateDataEntryFormTimeout( false );", 60000 ); - } - else{ - window.clearTimeout(timeOut); - } - }); + jQuery.postJSON("setAutoSaveSetting.action", {autoSave:_autoSave}, function(json) { + autoSave = _autoSave; + if (_autoSave) { + window.setTimeout( "validateDataEntryFormTimeout( false );", 60000 ); + } + else{ + window.clearTimeout(timeOut); + } + }); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2013-01-05 15:22:55 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2013-01-23 09:08:59 +0000 @@ -92,7 +92,8 @@   |  -   |  +    +   |  $i18n.getString( 'auto_save_data_entry_forms' ) @@ -162,5 +163,18 @@ - + + + +
+
+
+ +
+
+
=== 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 2012-12-10 13:14:06 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2013-01-23 09:08:59 +0000 @@ -12,53 +12,6 @@ dhis-web-maintenance-settings=Settings flag=Flag no_flag=No flag -algeria=Algeria -ethiopia=Ethiopia -india=India -irc=International Rescue Committee -armenia=Armenia -malawi=Malawi -mozambique=Mozambique -norway=Norway -uganda=Uganda -sierra_leone=Sierra Leone -sierra_leone_coat_of_arms=Sierra Leone Coat of Arms -south_africa=South Africa -south_africa_department_of_health=South Africa Department of Health -tanzania=Tanzania -vietnam=Vietnam -pepfar=PEPFAR -nigeria=Nigeria -ivory_coast=Ivory Coast -botswana=Botswana -global_fund=Global Fund -zambia=Zambia -tajikistan=Tajikistan -mali=Mali -zanzibar=Zanzibar -swaziland=Swaziland -gambia=Gambia -kenya=Kenya -lesotho=Lesotho -namibia=Namibia -ghana=Ghana -who=WHO -burkina_faso=Burkina Faso -burkina_faso_coat_of_arms=Burkina Faso Coat of Arms -guinea=Guinea -guinea_bissau=Guinea Bissau -liberia=Liberia -rwanda=Rwanda -senegal=Senegal -benin=Benin -bangladesh=Bangladesh -philippines=Philippines -niger=Niger -sri_lanka=Sri Lanka -cambodia=Cambodia -indonesia=Indonesia -zimbabwe=Zimbabwe -togo=Togo macos=Mac OS portal=Portal start_page=Start page @@ -94,20 +47,6 @@ cache_for_two_weeks=Cache for two weeks max_levels_to_offline=Maximum offline organisation unit levels phone_number_area_code = Phone number area code -china=China -afghanistan=Afghanistan -myanmar=Myanmar -colombia=Colombia -ecuador=Ecuador -peru=Peru -paraguay=Paraguay -nicaragua=Nicaragua -solomon_islands=Solomon Islands -republic_of_trinidad_and_tobago=Republic of Trinidad & Tobago -congo_brazzaville=Republic of the Congo -congo_kinshasa=Democratic Republic of the Congo -vanuatu=Vanuatu -timor_leste=Timor-Leste application_introduction=Application introduction do_not_allow_self_registration=Do not allow self registration access_settings=Access settings === 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 2012-12-19 12:31:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_es_ES.properties 2013-01-23 09:08:59 +0000 @@ -24,50 +24,6 @@ dhis-web-maintenance-settings=Configuraciones light_blue=Azul claro green=Verde -ethiopia=Etiop\u00eda -india=India -irc=International Rescue Committee -armenia=Armenia -malawi=Malawi -mozambique=Mozambique -norway=Noruega -uganda=Uganda -sierra_leone=Sierra Leona -sierra_leone_coat_of_arms=Sierra Leone Coat of Arms -south_africa=Sud\u00e1frica -south_africa_department_of_health=Departamento de Salud de Sud\u00e1frica -tanzania=Tanzania -vietnam=Vietnam -nigeria=Nigeria -ivory_coast=Costa de Marfil -botswana=Botswana -zambia=Zambia -tajikistan=Tayikistan -mali=Mali -zanzibar=Zanz\u00edbar -swaziland=Suazilandia -gambia=Gambia -kenya=Kenia -lesotho=Lesoto -namibia=Namibia -ghana=Ghana -who=OMS -burkina_faso=Burkina Faso -burkina_faso_coat_of_arms=Burkina Faso Coat of Arms -guinea=Guinea -guinea_bissau=Guinea Bissau -liberia=Liberia -rwanda=Ruanda -senegal=Senegal -benin=Benin -bangladesh=Bangladesh -philippines=Filipinas -niger=N\u00edger -sri_lanka=Sri Lanka -cambodia=Camboya -indonesia=Indonesia -zimbabwe=Zimbabue -togo=Togo macos=Mac OS intro_user_general_settings=Personalizaci\u00f3n de usuario del sistema, configuraci\u00f3n regional, de estilo y m\u00e1s. intro_user_message_settings=Personalizaci\u00f3n de usuario del sistema, configuraci\u00f3n de mensajes de email y sms\u00b4s de notificaci\u00f3n. @@ -105,24 +61,10 @@ no_cache=Sin cach\u00e9 cache_until_6am_tomorrow=Cach\u00e9 hasta ma\u00f1ana a las 6 AM cache_for_two_weeks=Cach\u00e9 para dos semanas -pepfar=PEPFAR intro_system_access_settings=Configuraci\u00f3n del acceso al sistema, como que rol de usuario se debe asignar a los usuarios que se registrado ellos mismos. system_access_settings=Configuraci\u00f3n de acceso al sistema max_levels_to_offline=M\u00e1ximos niveles de unidad organizativa en modo offline phone_number_area_code=C\u00f3digo de \u00e1rea del n\u00famero de tel\u00e9fono -china=China -afghanistan=Afganist\u00e1n -myanmar=Myanmar -colombia=Colombia -ecuador=Ecuador -peru=Per\u00fa -paraguay=Paraguay -nicaragua=Nicaragua -solomon_islands=Islas Salom\u00f3n -republic_of_trinidad_and_tobago=Republica de Trinidad y Tobago -congo_brazzaville=Rep\u00fablica del Congo -congo_kinshasa=Rep\u00fablica Democr\u00e1tica del Congo -vanuatu=Vanuatu timor_leste=Timor Oriental application_introduction=Introducci\u00f3n a la aplicaci\u00f3n access_settings=Configuraci\u00f3n de acceso === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_fr_FR.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_fr_FR.properties 2012-03-08 08:08:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_fr_FR.properties 2013-01-23 09:08:59 +0000 @@ -38,48 +38,6 @@ vista=Vista flag=Drapeau no_flag=Pas de Drapeau -ethiopia=Ethiopie -india=Inde -irc=Comit\u00e9 de secours international -armenia=Arm\u00e9nie -malawi=Malawi -mozambique=Mozambique -norway=Norv\u00e8ge -uganda=Ouganda -sierra_leone=Sierra Leone -sierra_leone_coat_of_arms=Sierra Leone (Armoiries) -south_africa=Afrique du sud -south_africa_department_of_health=Afrique du sud (D\u00e9partement de la sant\u00e9) -tanzania=Tanzanie -vietnam=Viet Nam -nigeria=Nig\u00e9ria -ivory_coast=C\u00f4te d'Ivoire -botswana=Botswana -zambia=Zambie -tajikistan=Tadjikistan -mali=Mali -zanzibar=Zanzibar -swaziland=Swaziland -gambia=Gambie -kenya=Kenya -lesotho=Lesotho -namibia=Namibie -ghana=Ghana -who=OMS -burkina_faso=Burkina Faso -guinea=Guin\u00e9e -guinea_bissau=Guin\u00e9e Bissau -liberia=Lib\u00e9ria -rwanda=Rwanda -senegal=S\u00e9n\u00e9gal -benin=B\u00e9nin -bangladesh=Bangladesh -philippines=Phlippines -sri_lanka=Sri Lanka -cambodia=Cambodge -indonesia=Indon\u00e9sie -zimbabwe=Zimbabwe -togo=Togo macos=Mac OS portal=Portail start_page=Page d'accueil === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_my_MM.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_my_MM.properties 2012-04-06 10:24:26 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_my_MM.properties 2013-01-23 09:08:59 +0000 @@ -19,48 +19,6 @@ green=Green flag=Flag no_flag=No flag -ethiopia=Ethiopia -india=India -irc=International Rescue Committe -armenia=Armenia -malawi=Malawi -mozambique=Mozambique -norway=Norway -uganda=Uganda -sierra_leone=Sierra Leone -sierra_leone_coat_of_arms=Sierra Leone Coat of arms -south_africa=South Africa -south_africa_department_of_health=South Africa Department of Health -tanzania=Tanzania -vietnam=Vietnam -nigeria=Nigeria -ivory_coast=Ivory Coast -botswana=Botswana -zambia=Zambia -tajikistan=Tajikistan -mali=Mali -zanzibar=Zanzibar -swaziland=Swaziland -gambia=Gambia -kenya=Kenya -lesotho=Lesotho -namibia=Namibia -ghana=Ghana -who=WHO -burkina_faso=Burkina Faso -guinea=Guinea -guinea_bissau=Guinea Bissau -liberia=Liberia -rwanda=Rwanda -senegal=Senegal -benin=Benin -bangladesh=Bangladesh -philippines=Phlippines -sri_lanka=Sri Lanka -cambodia=Cambodia -indonesia=Indonesia -zimbabwe=Zimbabwe -togo=Togo macos=Mac OS portal=Portal start_page=Start page === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_pt_PT.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_pt_PT.properties 2012-07-19 11:19:00 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_pt_PT.properties 2013-01-23 09:08:59 +0000 @@ -38,48 +38,7 @@ vista=Vista flag=Bandeira no_flag=Sem bandeira -ethiopia=Eti\u00f3pia -india=\u00cdndia irc=Comit\u00ea Internacional de Salvamento -armenia=Arm\u00eania -malawi=Malawi -mozambique=Mo\u00e7ambique -norway=Noruega -uganda=Uganda -sierra_leone=Serra Leoa -sierra_leone_coat_of_arms=Serra Leoa bras\u00e3o de armas -south_africa=\u00c1frica do Sul -south_africa_department_of_health=\u00c1frica do Sul Departamento de Sa\u00fade -tanzania=Tanz\u00e2nia -vietnam=Vietname -nigeria=Nig\u00e9ria -ivory_coast=Costa do Marfim -botswana=Botswana -zambia=Z\u00e2mbia -tajikistan=Tajiquist\u00e3o -mali=Mali -zanzibar=Zanzibar -swaziland=Suazil\u00e2ndia -gambia=G\u00e2mbia -kenya=Qu\u00eania -lesotho=Lesoto -namibia=Nam\u00edbia -ghana=Gana -who=OMS -burkina_faso=Burkina Faso -guinea=Guin\u00e9 -guinea_bissau=Guin\u00e9-Bissau -liberia=Lib\u00e9ria -rwanda=Ruanda -senegal=Senegal -benin=Benin -bangladesh=Bangladesh -philippines=Filipinas -sri_lanka=Sri Lanka -cambodia=Camboja -indonesia=Indon\u00e9sia -zimbabwe=Zimb\u00e1bue -togo=Togo macos=Mac OS portal=Portal start_page=P\u00e1gina inicial === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties 2012-10-08 07:10:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties 2013-01-23 09:08:59 +0000 @@ -1,10 +1,7 @@ #Resource generated by I18n Resource Editor #Tue Nov 01 15:15:03 ICT 2011 -south_africa=Nam Phi store_title=L\u01b0u m\u00e0u c\u1ee7a ti\u00eau \u0111\u1ec1 batch=L\u00f4 -liberia=Liberia -zimbabwe=Zim-ba-gu\u00ea irc=\u1ee6y ban gi\u1ea3i c\u1ee9u qu\u1ed1c t\u1ebf set_top_background_color=M\u00e0u n\u1ec1n ph\u00eda tr\u00ean forum_integration=T\u1ed5ng h\u1ee3p di\u1ec5n \u0111\u00e0n @@ -12,7 +9,6 @@ report_framework=H\u1ec7 th\u1ed1ng b\u00e1o c\u00e1o dhis-web-dashboard=B\u1ea3ng \u0111i\u1ec1u khi\u1ec3n lockout_timeframe=\u0110\u1ecbnh m\u1ee9c s\u1ed1 ph\u00fat sau khi s\u1ed1 ng\u01b0\u1eddi d\u00f9ng t\u1ed1i \u0111a \u0111\u0103ng nh\u1eadp -zambia=Zam-bi-a dhis-web-jforum-integration=Di\u1ec5n \u0111\u00e0n portal=C\u1ed5ng \u0111i\u1ec7n t\u1eed data_analysis_factor=Y\u1ebfu t\u1ed1 ph\u00e2n t\u00edch d\u1eef li\u1ec7u @@ -21,35 +17,26 @@ custom=L\u1ec1 th\u00f3i system_identifier=\u0110\u1ecbnh danh h\u1ec7 th\u1ed1ng appearance=Thi\u1ebft l\u1eadp giao di\u1ec7n -gambia=Gam-bi-a host_name=\u0110\u1ecba ch\u1ec9 m\u00e1y ch\u1ee7 (URL) -zanzibar=Zanzibar start_page=Trang nh\u1ea5t user_email_settings=C\u00e1c thi\u1ebft l\u1eadp c\u1ea5u h\u00ecnh th\u01b0 \u0111i\u1ec7n t\u1eed cho ng\u01b0\u1eddi d\u00f9ng completeness_email_notification=Th\u00f4ng b\u00e1o tin nh\u1eafn v\u1ec1 b\u00e1o c\u00e1o nh\u1eadp \u0111\u1ea7y \u0111\u1ee7 qua th\u01b0 \u0111i\u1ec7n t\u1eed dhis-web-maintenance-user=C\u00e1c ng\u01b0\u1eddi d\u00f9ng intro_system_appearance_settings=Thi\u1ebft l\u1eadp h\u1ec7 th\u1ed1ng v\u1ec1 ti\u00eau \u0111\u1ec1 c\u1ee7a \u1ee9ng d\u1ee5ng, ki\u1ec3u phong c\u00e1ch, c\u1edd v\u00e0 trang ch\u00ednh khi v\u00e0o h\u1ec7 th\u1ed1ng. -ivory_coast=B\u1edd bi\u1ec3n ng\u00e0 completeness_recipients=Ho\u00e0n th\u00e0nh th\u00f4ng b\u00e1o ng\u01b0\u1eddi nh\u1eadn -mali=Ma-li application_title=Ti\u00eau \u0111\u1ec1 \u1ee9ng d\u1ee5ng light_blue=M\u00e0u xanh nh\u1ea1t dhis-web-maintenance-datadictionary=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u v\u00e0 Ch\u1ec9 s\u1ed1 -ethiopia=E-ti-\u00f4-pi-a -indonesia=In-\u0111\u00f4-n\u00ea-si-a shortname=T\u00ean vi\u1ebft t\u1eaft display_property=Hi\u1ec3n th\u1ecb thu\u1ed9c t\u00ednh birt=BIRT store_title_color=L\u01b0u m\u00e0u c\u1ee7a d\u00f2ng ti\u00eau \u0111\u1ec1 appearance_settings=C\u00e0i \u0111\u1eb7t giao di\u1ec7n -bangladesh=Bangladesh choose_db_language=Ch\u1ecdn ng\u00f4n ng\u1eef c\u01a1 s\u1edf d\u1eef li\u1ec7u vista=Vista save_zero_values=L\u01b0u c\u00e1c gi\u00e1 tr\u1ecb 0 \u0111\u1ec3 t\u1ed5ng h\u1ee3p c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u -sierra_leone=Sierra Leone disable_dataentry_when_dataset_completed=Kh\u00f4ng cho thay \u0111\u1ed5i d\u1eef li\u1ec7u khi t\u1eadp h\u1ee3p d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c khai b\u00e1o ho\u00e0n ch\u1ec9nh.#Resource generated by I18n Resource Editor dhis-web-maintenance-dataset=C\u00e1c t\u1eadp d\u1eef li\u1ec7u -south_africa_department_of_health=B\u1ed9 Y t\u1ebf Nam Phi tajikistan=Ta-zi-kis-tan top_background_color=M\u00e0u n\u1ec1n no_feedback_recipients=Ng\u01b0\u1eddi nh\u1eadn kh\u00f4ng c\u00f3 tin nh\u1eafn @@ -61,47 +48,34 @@ intro_system_general_settings=Thi\u1ebft l\u1eadp h\u1ec7 th\u1ed1ng v\u1ec1 c\u00e1ch th\u1ee9c t\u1ed5ng h\u1ee3p d\u1eef li\u1ec7u, C\u01a1 s\u1edf h\u1ea1 t\u1ea7ng h\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u, C\u01a1 s\u1edf h\u1ea1 t\u1ea7ng h\u00f3a ki\u1ec3u th\u1eddi gian, Kh\u00f3a bi\u1ec3u nh\u1eadp khi ho\u00e0n t\u1ea5t v\u00e0 h\u01a1n n\u1eefa. store_menu_element_colour=L\u01b0u m\u00e0y c\u1ee7a tr\u00ecnh \u0111\u01a1n dhis-web-importexport=V\u00e0o-Ra d\u1eef li\u1ec7u -lesotho=Lesotho -mozambique=M\u00f4-d\u0103m-b\u00edch days_after_period_timeliness=S\u1ed1 ng\u00e0y sau cu\u1ed1i k\u1ef3 \u0111\u1ec3 \u0111\u00e1nh gi\u00e1 th\u1eddi h\u1ea1n nh\u1eadp d\u1eef li\u1ec7u. background_color_in_menu=M\u00e0u n\u1ec1n c\u1ee7a thanh c\u00f4ng c\u1ee5 set_left_background_color=M\u00e0u n\u1ec1n b\u00ean tr\u00e1i feedback_recipients=Ph\u00e0n h\u1ed3i c\u1ee7a ng\u01b0\u1eddi nh\u1eadn system_general_settings=C\u00e1c thi\u1ebft l\u1eadp chung cho h\u1ec7 th\u1ed1ng delete_left_background_color=X\u00f3a m\u00e0u n\u1ec1n b\u00ean tr\u00e1i -benin=Benin -cambodia=C\u0103m-pu-chia dhis-web-dataentry=Nh\u1eadp d\u1eef li\u1ec7u v\u00e0o dhis-web-openhealth-integration=Ph\u00e2n t\u00edch d\u1eef li\u1ec7u -rwanda=Rwanda no_completeness_recipients=Ng\u01b0\u1eddi nh\u1eadn ch\u01b0a ho\u00e0n th\u00e0nh password=M\u1eadt kh\u1ea9u blue=M\u00f9a xanh -sri_lanka=Sri-lan-ka max_attempts=S\u1ed1 ng\u01b0\u1eddi d\u00f9ng t\u1ed1i \u0111a \u0111\u0103ng nh\u1eadp dhis-web-reporting=C\u00e1c b\u00e1o c\u00e1o store_background_color_in_menu=L\u01b0u m\u00e0u n\u1ec1n c\u1ee7a tr\u00ecnh \u0111\u01a1n extended=\u0110\u01b0\u1ee3c m\u1edf r\u1ed9ng set_active_menu_element_color=M\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n k\u00edch ho\u1ea1t store_left_background_color=L\u01b0u m\u00e0u n\u1ec1n b\u00ean tr\u00e1i -burkina_faso=Burkina Faso -india=\u1ea4n \u0111\u1ed9 system_email_settings=C\u00e1c thi\u1ebft l\u1eadp v\u1ec1 th\u01b0 \u0111i\u1ec7n t\u1eed cho h\u1ec7 th\u1ed1ng system_appearance_settings=C\u00e1c thi\u1ebft l\u1eadp v\u1ec1 giao di\u1ec7n cho h\u1ec7 th\u1ed1ng code=M\u00e3 -armenia=Armenia intro_system_email_settings=Thi\u1ebft l\u1eadp h\u1ec7 th\u1ed1ng v\u1ec1 th\u01b0 \u0111i\u1ec7n t\u1eed. macos=H\u1ec7 \u0111i\u1ec1u h\u00e0nh Mac -guinea_bissau=Guinea Bissau color_scheme=M\u1eabu m\u00e0u choose_sort_order=Ch\u1ecdn th\u1ee9 t\u1ef1 s\u1eafp x\u1ebfp regular=B\u00ecnh th\u01b0\u1eddng -botswana=Botswana dhis-web-reports=C\u00e1c b\u00e1o c\u00e1o NRHM welcome_to=Ch\u00e0o m\u1eebng \u0111\u1ebfn v\u1edbi alternativename=T\u00ean thay th\u1ebf -nigeria=Ni-g\u00ea-ri-a -kenya=Ken-za dhis-web-maintenance-organisationunit=C\u00e1c \u0111\u01a1n v\u1ecb choose_language=Ch\u1ecdn ng\u00f4n ng\u1eef set_title=Ti\u00eau \u0111\u1ec1 ch\u01b0\u01a1ng tr\u00ecnh @@ -110,41 +84,29 @@ menu_element_color=M\u00e0u thanh c\u00f4ng c\u1ee5 dhis-web-datamart=D\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p store=L\u01b0u -who=T\u1ed5 ch\u1ee9c Y t\u1ebf th\u1ebf gi\u1edbi dhis-web-maintenance-dataadmin=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u delete_title_color=X\u00f3a m\u00e0u c\u1ee7a d\u00f2ng ti\u00eau \u0111\u1ec1 store_active_menu_element_color=L\u01b0u m\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n \u0111\u01b0\u1ee3c k\u00edch ho\u1ea1t title_color=M\u00e0u ti\u00eau \u0111\u1ec1 dhis-web-validationrule=Ch\u1ea5t l\u01b0\u1ee3ng d\u1eef li\u1ec7u delete_top_background_color=X\u00f3a m\u00e0u n\u1ec1n ph\u00eda tr\u00ean -swaziland=Swaziland -sierra_leone_coat_of_arms=Sierra Leone Coat of arms -senegal=Senegal green=M\u00e0u xanh l\u00e1 c\u00e2y -uganda=U-gan-\u0111a sort_order=Th\u1ee9 t\u1ef1 s\u1eafp x\u1ebfp delete_active_menu_element_color=X\u00f3a m\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n k\u00edch ho\u1ea1t dhis-web-integration=T\u1ed5ng h\u1ee3p NHRM choose_display_property=Ch\u1ecdn ch\u1ebf \u0111\u1ed9 hi\u1ec3n th\u1ecb infrastructural_data_elements=Ki\u1ebfn tr\u00fac d\u1eef li\u1ec7u delete_background_color_in_menu=X\u00f3a m\u00e0u n\u1ec1n c\u1ee7a tr\u00ecnh \u0111\u01a1n -malawi=Ma-la-gi set_background_color_in_menu=M\u00e0u n\u1ec1n c\u1ee7a tr\u00ecnh \u0111\u01a1n set_title_color=M\u00e0u c\u1ee7a d\u00f2ng ti\u00eau \u0111\u1ec1 infrastructural_period_type=Ki\u1ebfn tr\u00fac lo\u1ea1i th\u1eddi \u0111i\u1ec3m -guinea=Guinea smtp_settings=C\u00e0i \u0111\u1eb7t email omit_indicators_zero_numerator_data_mart=L\u01b0\u1ee3t b\u1ecf c\u00e1c gi\u00e1 tr\u1ecb ch\u1ec9 s\u1ed1 v\u1edbi t\u1eed s\u1ed1 b\u1eb1ng 0 trong d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p username=T\u00ean \u0111\u0103ng nh\u1eadp dhis-web-dashboard-integration=B\u1ea3ng \u0111i\u1ec1u khi\u1ec3n dhis-web-maintenance-settings=C\u00e0i \u0111\u1eb7t -vietnam=Vi\u1ec7t nam store_top_background_color=L\u01b0u m\u00e0u n\u1ec1n ph\u00eda tr\u00ean -philippines=Phi-lip-pin -namibia=Na-mi-bi-a data_dictionary_mode=Ch\u1ebf \u0111\u1ed9 t\u1eeb \u0111i\u1ec3n d\u1eef li\u1ec7u -tanzania=Tan-za-ni-a -ghana=Ga-na active_menu_element_color=K\u00edch ho\u1ea1t m\u00e0u c\u1ee7a thanh c\u00f4ng c\u1ee5 set_menu_element_colour=M\u00e0u c\u1ee7a tr\u00ecnh \u0111\u01a1n system_settings=C\u00e0i \u0111\u1eb7t h\u1ec7 th\u1ed1ng @@ -152,7 +114,5 @@ email=Thi\u1ebft l\u1eadp giao th\u1ee9c th\u01b0 \u0111i\u1ec7n t\u1eed delete_menu_element_colour=X\u00f3a m\u00e0u c\u1ee7a c\u00e1c th\u00e0nh ph\u1ea7n tr\u00ecnh \u0111\u01a1n real_time=Th\u1eddi gian th\u1ef1c -norway=Na uy -togo=T\u00f4-g\u00f4 flag=C\u1edd qu\u1ed1c gia system_overview=System overview \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_zh_CN.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_zh_CN.properties 2012-09-24 17:36:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_zh_CN.properties 2013-01-23 09:08:59 +0000 @@ -1,57 +1,40 @@ #Resource generated by I18n Resource Editor #Sat Jun 30 21:00:00 CST 2012 financialyApril=\u56DB\u6708 -china=\u4E2D\u56FD -south_africa=\u5357\u975E batch=\u5206\u6279\u5904\u7406 -liberia=\u5229\u6BD4\u91CC\u4E9A -zimbabwe=\u6D25\u5DF4\u5E03\u97E6 -irc=\u56FD\u9645\u7EA2\u5341\u5B57\u4F1A sort_order_property=\u6392\u5E8F\u5C5E\u6027 forum_integration=\u7EFC\u5408\u8BBA\u575B no_start_page=\u65E0\u5F00\u59CB\u9875 lockout_timeframe=\u6700\u5927\u767B\u5F55\u5C1D\u8BD5\u540E\u9501\u5B9A\u7684\u5206\u949F\u6570 -zambia=\u8D5E\u6BD4\u4E9A message=\u6D88\u606F portal=\u5165\u53E3 data_analysis_factor=\u6570\u636E\u5206\u6790\u56E0\u5B50 general_settings=\u5E38\u89C4\u8BBE\u7F6E no_cache=\u65E0\u7F13\u51B2 -openhealth=OpenHealth style=\u98CE\u683C custom=\u4E60\u60EF intro_user_settings=\u81EA\u5B9A\u4E49\u7CFB\u7EDF\u5177\u6709\u7528\u6237\u7279\u5B9A\u7684\u8BBE\u7F6E\uFF0C\u5982\u5C40\u90E8\u8BBE\u7F6E\u3001\u6392\u5E8F\u3001\u663E\u793A\u6240\u6709\u6743\u3001\u98CE\u683C\u6216\u8005\u66F4\u591A max_levels_to_offline=\u79BB\u7EBF\u7684\u6700\u5927\u673A\u6784\u7B49\u7EA7 system_identifier=\u7CFB\u7EDF\u6807\u8BC6\u7B26 appearance=\u5916\u89C2 -gambia=\u5188\u6BD4\u4E9A host_name=\u4E3B\u673A\u540D -zanzibar=\u6851\u7ED9\u5DF4\u5C14\u5C9B start_page=\u5F00\u59CB\u9875\u9762 user_email_settings=\u7528\u6237\u90AE\u4EF6\u8BBE\u7F6E completeness_email_notification=\u5B8C\u6210\u7535\u90AE\u901A\u77E5 intro_system_appearance_settings=\u5B9A\u5236\u7CFB\u7EDF\u884C\u4E3A\u8BF8\u5982\u5E94\u7528\u6807\u9898\u3001\u98CE\u683C\u3001\u56FD\u65D7\u548C\u8D77\u59CB\u9875 -ivory_coast=\u79D1\u7279\u8FEA\u74E6 completeness_recipients=\u5B8C\u6210\u901A\u77E5\u6536\u4EF6\u4EBA -mali=\u9A6C\u91CC application_title=\u5E94\u7528\u6807\u9898 light_blue=\u6DE1\u84DD\u8272 use_db_locale_no_translation=\u4F7F\u7528\u6570\u636E\u5E93\u65B9\u8A00\u6216\u65E0\u7FFB\u8BD1 -ethiopia=\u57C3\u585E\u4FC4\u6BD4\u4E9A -indonesia=\u5370\u5C3C shortname=\u7B80\u79F0 display_property=\u663E\u793A\u5C5E\u6027 appearance_settings=\u5916\u89C2\u8BBE\u7F6E monthly=\u6BCF\u6708 -bangladesh=\u5B5F\u52A0\u62C9\u56FD quarterly=\u6BCF\u5B63\u5EA6 vista=vista save_zero_values=\u4FDD\u5B58\u96F6\u503C -sierra_leone=\u585E\u62C9\u5229\u6602 daily=\u6BCF\u5929 disable_dataentry_when_dataset_completed=\u5F53\u6570\u636E\u96C6\u5B8C\u6210\u65F6\u8BBE\u7F6E\u4E0D\u80FD\u8FDB\u884C\u6570\u636E\u8F93\u5165 -south_africa_department_of_health=\u5357\u975E\u536B\u751F\u90E8\u95E8 -tajikistan=\u5854\u5409\u514B\u65AF\u5854 top_background_color=\u9876\u7AEF\u80CC\u666F\u989C\u8272 no_feedback_recipients=\u65E0\u53CD\u9988\u63A5\u6536\u8005 settings_updated=\u8BBE\u7F6E\u5DF2\u7ECF\u66F4\u65B0 @@ -59,48 +42,35 @@ db_language=\u6570\u636E\u5E93\u8BED\u8A00 dashboard_charts_to_display=\u72B6\u6001\u9762\u677F\u663E\u793A\u7684\u56FE\u8868 intro_system_general_settings=\u5B9A\u5236\u8BF8\u5982\u4F1A\u805A\u7B56\u7565\u3001\u6846\u67B6\u6570\u636E\u5143\u7B49\u7CFB\u7EDF\u884C\u4E3A -lesotho=\u83B1\u7D22\u6258 -mozambique=\u83AB\u6851\u6BD4\u514B days_after_period_timeliness=\u671F\u7EC8\u540E\u8BA4\u5B9A\u4ECD\u4E3A\u53CA\u65F6\u63D0\u4EA4\u6570\u636E\u7684\u5929\u6570 auto_save_data_entry_form=\u81EA\u52A8\u4FDD\u5B58\u6570\u636E\u8F93\u5165\u5F62\u5F0F background_color_in_menu=\u4E3B\u76EE\u5F55\u4E2D\u7684\u80CC\u666F\u8272 feedback_recipients=\u53CD\u9988\u63A5\u6536\u8005 general=\u5E38\u89C4 system_general_settings=\u7CFB\u7EDF\u5E38\u89C4\u8BBE\u7F6E -benin=\u8D1D\u5B81 -\u00EF\u00BB\u00BF\#Resource=generated by I18n Resource Editor -cambodia=\u67EC\u57D4\u5BE8 intro_system_settings=\u81EA\u5B9A\u4E49\u7CFB\u7EDF\u7684\u884C\u4E3A\u53BB\u62A5\u8868\u6846\u67B6\u3001\u8D77\u59CB\u9875\u3001\u6807\u9898\u3001\u65D7\u5E1C\u6216\u8005\u66F4\u591A\u3002 user_general_settings=\u7528\u6237\u5E38\u89C4\u8BBE\u7F6E -rwanda=\u5362\u65FA\u8FBE no_completeness_recipients=\u6CA1\u6709\u5B8C\u6210\u6536\u4EF6\u4EBA user_message_settings=\u7528\u6237\u77ED\u4FE1\u901A\u77E5\u8BBE\u7F6E password=\u53E3\u4EE4 blue=\u84DD\u8272 cache_strategy=\u7F13\u51B2\u7B56\u7565 -sri_lanka=\u65AF\u91CC\u5170\u5361 intro_user_general_settings=\u5B9A\u5236\u7528\u6237\u6307\u5B9A\u7684\u672C\u5730\u5316\u8BED\u8A00\u3001\u6392\u5E8F\u3001\u663E\u793A\u5C5E\u6027\u3001\u98CE\u683C\u7B49 max_attempts=\u767B\u5F55\u6700\u5927\u6B21\u6570\u7684\u5C1D\u8BD5 intro_user_message_settings=\u5B9A\u5236\u7CFB\u7EDF\u90AE\u4EF6\u4FE1\u606F\u548CSMS\u901A\u77E5\u8BBE\u7F6E weekly=\u6BCF\u5468 extended=\u6269\u5C55 -burkina_faso=\u5E03\u5409\u7EB3\u6CD5\u7D22 -india=\u6A58\u7EA2 system_email_settings=\u7CFB\u7EDF\u90AE\u4EF6\u8BBE\u7F6E system_overview=\u7CFB\u7EDF\u6982\u8FF0 system_appearance_settings=\u7CFB\u7EDF\u5916\u89C2\u8BBE\u7F6E -burkina_faso_coat_of_arms=\u5E03\u57FA\u7EB3\u6CD5\u7D22 code=\u4EE3\u7801 intro_user_email_settings=\u5B9A\u5236\u7528\u6237\u6307\u5B9A\u7684email\u6D88\u606F\u901A\u77E5\u7CFB\u7EDF\u8BBE\u7F6E -armenia=\u4E9A\u7F8E\u5C3C\u4E9A intro_system_email_settings=\u914D\u7F6E\u8BF8\u5982\u4E3B\u673A\u3001\u7528\u6237\u548C\u53E3\u4EE4\u7B49SMTP email\u8BBE\u7F6E macos=\u82F9\u679C\u64CD\u4F5C\u7CFB\u7EDF -guinea_bissau=\u51E0\u5185\u4E9A\u6BD4\u7ECD settings=\u8BBE\u7F6E color_scheme=\u8272\u5F69\u65B9\u6848 yearly=\u6BCF\u5E74 regular=\u5B9A\u671F -botswana=\u535A\u8328\u74E6\u7EB3 alternativename=\u66FF\u4EE3\u540D\u79F0 nigeria=\u5C3C\u65E5\u5229\u4E9A kenya=\u80AF\u5C3C\u4E9A @@ -109,39 +79,25 @@ menu_element_color=\u83DC\u5355\u5143\u7D20\u989C\u8272 who=\u4E16\u754C\u536B\u751F\u7EC4\u7EC7 title_color=\u6807\u9898\u989C\u8272 -swaziland=\u65AF\u5A01\u58EB\u5170 -sierra_leone_coat_of_arms=\u585E\u62C9\u5229\u6602\u5C42\u76FE\u5F62\u7EB9\u7AE0 -senegal=\u585E\u5185\u52A0\u5C14 green=\u7EFF\u8272 -uganda=\u4E4C\u5E72\u8FBE sort_order=\u6392\u5E8F message_sms_notification=\u77ED\u4FE1\u901A\u77E5 -niger=\u5C3C\u65E5\u5C14 infrastructural_data_elements=\u57FA\u7840\u6570\u636E\u5143 -malawi=\u9A6C\u62C9\u7EF4 infrastructural_period_type=\u57FA\u7840\u6570\u636E\u5468\u671f\u7C7B\u578B cache_until_6am_tomorrow=\u7F13\u51B2\u81F3\u660E\u5929\u65E9\u4E0A\u516D\u70B9 -guinea=\u51E0\u5185\u4E9A smtp_settings=SMTP\u8BBE\u7F6E omit_indicators_zero_numerator_data_mart=\u6570\u636E\u96C6\u5E02\u4E2D\u5FFD\u7565\u5206\u5B50\u503C\u4E3A0\u7684\u6307\u6807\u503C username=\u7528\u6237\u540D dhis-web-maintenance-settings=\u8BBE\u7F6E -vietnam=\u6DF1\u7EA2 cache_for_two_weeks=\u7F13\u51B2\u4E24\u5468 -philippines=\u83F2\u5F8B\u5BBE -namibia=\u7EB3\u7C73\u6BD4\u4E9A data_dictionary_mode=\u6570\u636E\u8BCD\u5178\u6A21\u578B message_email_notification=\u4FE1\u606F\u90AE\u4EF6\u901A\u77E5 -tanzania=\u5766\u6851\u5C3C\u4E9A user_settings=\u7528\u6237\u8BBE\u7F6E sixmonthly=\u6BCF\u516D\u4E2A\u6708 -ghana=\u52A0\u7EB3 language=\u754C\u9762\u8BED\u8A00 active_menu_element_color=\u6D3B\u52A8\u83DC\u5355\u989C\u8272 can_be_set_once=\u53EA\u80FD\u8BBE\u5B9A\u4E00\u6B21 system_settings=\u7CFB\u7EDF\u8BBE\u7F6E email=\u7535\u90AE real_time=\u5B9E\u65F6 -togo=\u591A\u54E5 flag=\u56FD\u65D7 -norway=\u632A\u5A01