=== 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-10-03 19:23:05 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-10-15 14:07:18 +0000 @@ -81,7 +81,7 @@ 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-settings=Maintain user and system settings related to appearance, notifications and more. intro_dhis-web-maintenance-program=Maintain tracked entities 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-maintenance-appmanager=Access and upload apps, which are extensions to the standard user interface. @@ -1017,3 +1017,5 @@ event_count=Event count enrollment_count=Enrollment count tei_count=Tracked entity instance count +dhis-web-settings=Settings + === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties 2014-12-17 10:03:49 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties 2015-10-15 14:07:18 +0000 @@ -586,7 +586,7 @@ armenia=\u0627\u0631\u0645\u064a\u0646\u064a\u0627 bangladesh=\u0628\u0646\u063a\u0644\u0627\u062f\u064a\u0634 caused_by=\u062a\u0633\u0628\u0628 \u0645\u0646 \u0642\u0628\u0644 -intro_dhis-web-maintenance-settings=\u0635\u064a\u0627\u0646\u0629 \u0627\u0639\u062f\u062f\u0627\u062a \u0627\u0644\u0646\u0638\u0627\u0645 \u0648\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0645\u062a\u0639\u0644\u0642\u0629 \u0628\u0627\u0644\u0638\u0647\u0648\u0631 \u060c \u0627\u0644\u0627\u062e\u0637\u0627\u0631\u0627\u062a \u0648\u0627\u0644\u0645\u0632\u064a\u062f +intro_dhis-web-settings=\u0635\u064a\u0627\u0646\u0629 \u0627\u0639\u062f\u062f\u0627\u062a \u0627\u0644\u0646\u0638\u0627\u0645 \u0648\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u0645\u062a\u0639\u0644\u0642\u0629 \u0628\u0627\u0644\u0638\u0647\u0648\u0631 \u060c \u0627\u0644\u0627\u062e\u0637\u0627\u0631\u0627\u062a \u0648\u0627\u0644\u0645\u0632\u064a\u062f benin=\u0628\u064a\u0646\u064a\u0646 bhutan=\u0628\u0648\u062a\u0627\u0646 botswana=\u0628\u062a\u0633\u0648\u0627\u0646\u0627 @@ -725,4 +725,5 @@ intro_profile=\u0627\u0636\u0628\u0637 \u0645\u0644\u0641\u0643 \u0627\u0644\u0634\u062e\u0635\u064a \u0645\u0639 \u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0645\u062b\u0644 \u0627\u0633\u0645 \u0627\u0644\u0645\u0647\u0646\u0629 \u0648\u0627\u0644\u0627\u0647\u062a\u0645\u0627\u0645\u0627\u062a intro_account=\u062e\u0637\u0637 \u062d\u0633\u0627\u0628\u0643 \u0645\u0646 \u0636\u0645\u0646\u0647 \u0627\u0644\u0627\u0633\u0645\u060c \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631\u060c \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u0648\u0627\u0644\u0645\u0648\u0628\u0627\u064a\u0644 intro_log_out=\u0627\u0630\u0647\u0628 \u0647\u0646\u0627 \u0644\u062a\u0633\u062c\u0644 \u0627\u0644\u062e\u0631\u0648\u062c \u0645\u0646 \u0627\u0644\u0646\u0638\u0627\u0645 \u0648\u062a\u0645\u0646\u0639 \u0627\u0644\u0627\u062e\u0631\u064a\u0646 \u0645\u0646 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644\u062d\u0633\u0627\u0628\u0643 -offline=\u0642\u0637\u0639 \u0627\u0644\u0627\u062a\u0635\u0627\u0644 \u0628\u0627\u0644\u0646\u062a +offline=\u0642\u0637\u0639 \u0627\u0644\u0627\u062a\u0635\u0627\u0644 \u0628\u0627\u0644\u0646\u062a +dhis-web-settings=\u0627\u0639\u062f\u0627\u062f\u0627\u062a === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties 2014-11-05 09:10:58 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties 2015-10-15 14:07:18 +0000 @@ -494,7 +494,7 @@ botswana=Botsuana burkina_faso_coat_of_arms=Escudo de armas de Burkina Faso cambodia=Camboya -intro_dhis-web-maintenance-settings=Mantenimiento de usuario y ajustes de sistema relacionados con la apariencia, notificaciones y m\u00e1s. +intro_dhis-web-settings=Mantenimiento de usuario y ajustes de sistema relacionados con la apariencia, notificaciones y m\u00e1s. congo_brazzaville=Rep\u00fablica del Congo congo_kinshasa=Rep\u00fablica Democr\u00e1tica del Congo ethiopia=Etiop\u00eda @@ -560,4 +560,5 @@ intro_account=Administrar su cuenta de usuario incluyendo nombre, contrase\u00f1a, correo electr\u00f3nico y tel\u00e9fono m\u00f3vil. intro_log_out=Venga aqu\u00ed para salir del sistema e impedir el acceso de otros usuarios a su cuenta. offline=Desconectado -online=Conectado +online=Conectado +dhis-web-settings=Configuraci\u00f3n === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties 2015-10-12 05:17:34 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties 2015-10-15 14:07:18 +0000 @@ -81,7 +81,7 @@ intro_dhis-web-maintenance-organisationunit=G\u00E9rer les unit\u00E9s d'organisation ainsi que leur hi\u00E9rarchie, leurs groupes et leurs ensembles de groupes. intro_dhis-web-maintenance-user=G\u00E9rer les utilisateurs en termes droits, mots de passe, r\u00F4les des utilisateurs et groupes. intro_dhis-web-maintenance-dataadmin=G\u00E9rer les tables de ressources, v\u00E9rifier l'int\u00E9grit\u00E9 des donn\u00E9es, voir les statistiques et plus. -intro_dhis-web-maintenance-settings=G\u00E9rer les param\u00E8tres utilisateur et syst\u00E8me li\u00E9s \u00E0 l'apparence, notifications et autres. +intro_dhis-web-settings=G\u00E9rer les param\u00E8tres utilisateur et syst\u00E8me li\u00E9s \u00E0 l'apparence, notifications et autres. intro_dhis-web-maintenance-program=Maintenance des entit\u00E9s suivies et des programmes, attributs et identifiants intro_dhis-web-maintenance-mobile=G\u00E9rer les ensembles de donn\u00E9es ainsi que les param\u00E8tres pour le rapportage mobile et configuration de SMS. intro_dhis-web-maintenance-appmanager=Charger des applications sur le serveur et y acc\u00E9der. Les applications sont des extensions \u00E0 l'interface utilisateur standard. @@ -961,3 +961,4 @@ event_count=Nombre d'\u00E9v\u00E8nements enrollment_count=Nombre d'enregistrements tei_count=Nombre d'entit\u00E9s suivies +dhis-web-settings=Param\u00E8tres === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties 2015-10-15 14:07:18 +0000 @@ -236,7 +236,7 @@ dhis-web-maintenance-in=Konfigurasi intro_dhis-web-maintenance-dataset=mempertahankan set-set data, format-format kustom, bagian-bagian dan data-data elemen yang wajib intro_dhis-web-maintenance-user=mempertahankan pengguna-pengguna dan rangka kewenangan-kewenangan dan password-password, peran pengguna dan grup-grup -intro_dhis-web-maintenance-settings=mempertahankan pengguna dan seting sistem berhubungan dengan tampilan, pemberitahuan dan yang lainnya +intro_dhis-web-settings=mempertahankan pengguna dan seting sistem berhubungan dengan tampilan, pemberitahuan dan yang lainnya intro_dhis-web-maintenance-patient=mempertahankan penerima manfaat dan program-program termasuk atribut-atribut dan pengidentifikasi intro_dhis-web-validationrule=memvalidasi dan mengakses kualitas data menggunakan aturan-aturan validasi atau metode-metode statistik intro_dhis-web-reporting=analisa data menggunakan peralatan laporan standar dan dinamis dan melihat rata-rata laporan @@ -628,3 +628,4 @@ move_all=Pindahkan semua users=Pengguna sri_lanka=Sri Lanka +dhis-web-settings=pengaturan === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties 2015-06-01 06:36:35 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties 2015-10-15 14:07:18 +0000 @@ -354,4 +354,6 @@ email_invite_1_1st_paragraph_after_application_title=User Account email_invite_2_1st_paragraph_after_application_title=User Account logged_in=\u1794\u17b6\u1793\u200b\u1785\u17bc\u179b\u200b\u1782\u178e\u1793\u17b8 -offline=\u1780\u17d2\u179a\u17c5\u200b\u1794\u178e\u17d2\u178a\u17b6\u1789\u17a2\u17b7\u1793\u1792\u17ba\u179a\u178e\u17c2\u178f +offline=\u1780\u17d2\u179a\u17c5\u200b\u1794\u178e\u17d2\u178a\u17b6\u1789\u17a2\u17b7\u1793\u1792\u17ba\u179a\u178e\u17c2\u178f +dhis-web-settings=\u1780\u17c6\u178e\u178f\u17cb + === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties 2014-10-17 08:19:44 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties 2015-10-15 14:07:18 +0000 @@ -503,7 +503,7 @@ dhis-web-event-capture=\u200b\u0e81\u0eb2\u0e99\u200b\u0ec0\u0e81\u0eb1\u0e9a\u200b\u0e81\u0eb3\u200b\u0ec4\u0e94\u0ec9\u200b\u0ec0\u0eab\u0e94\u200b\u0e81\u0eb2\u0e99\u200b\u0e95\u0ec8\u0eb2\u0e87\u0ec6 intro_dhis-web-maintenance-datadictionary=\u200b\u0e81\u0eb2\u0e99\u200b\u0e9b\u0eb1\u0e9a\u200b\u0e9b\u0eb8\u0e87\u200b\u0ead\u0ebb\u0e87\u200b\u0e9b\u0eb0\u200b\u0e81\u0ead\u0e9a\u200b\u0e82\u0ecd\u0ec9\u200b\u0ea1\u0eb9\u0e99, \u0e95\u0ebb\u0ea7\u200b\u0e8a\u0eb5\u0ec9\u200b\u0ea7\u0eb1\u0e94, \u0e81\u0eb2\u0e99\u200b\u0ec1\u0e9b\u200b\u0e84\u0ea7\u0eb2\u0ea1\u200b\u0edd\u0eb2\u0e8d\u200b\u0e82\u0ecd\u0ec9\u200b\u0ea1\u0eb9\u0e99, \u0e9b\u0eb0\u200b\u0ec0\u0e9e\u0e94\u200b\u0e82\u0ecd\u0ec9\u200b\u0ea1\u0eb9\u0e99 \u0ec1\u0ea5\u0eb0 \u0e81\u0eb2\u0e99\u200b\u0ec1\u0e9a\u0ec8\u0e87\u200b\u0e81\u0eb8\u0ec8\u0ea1 intro_dhis-web-maintenance-dataadmin=\u200b\u0e81\u0eb2\u0e99\u200b\u0e9b\u0eb1\u0e9a\u200b\u0e9b\u0eb8\u0e87\u200b\u0e95\u200b\u0eb2\u200b\u0e95\u0eb0\u200b\u0ea5\u0eb2\u0e87\u200b\u0ec1\u0eab\u0ea5\u0ec8\u0e87\u200b\u0e97\u0eb5\u0ec8\u200b\u0ea1\u0eb2, \u0e81\u0eb2\u0e99\u0e81\u0ea7\u0e94\u200b\u0e81\u0eb2\u200b\u0e81\u0eb2\u0e99\u200b\u0e9b\u0eb0\u200b\u0eaa\u0eb2\u0e99\u200b\u0e82\u0ead\u0e87\u200b\u0e82\u0ecd\u0ec9\u200b\u0ea1\u0eb9\u0e99, \u0ec0\u0e9a\u0eb5\u0ec8\u0e87\u200b\u0eaa\u0eb0\u200b\u0e96\u0eb4\u200b\u0e95\u0eb4 \u0ec1\u0ea5\u0eb0 \u0ead\u0eb7\u0ec8\u0e99\u0ec6\u200b\u0ead\u0eb5\u0e81 -intro_dhis-web-maintenance-settings=Maintain user and system settings related to appearance, notifications and more. +intro_dhis-web-settings=Maintain user and system settings related to appearance, notifications and more. intro_dhis-web-maintenance-program=Maintain tracked entities and programs including attributes and identifiers. intro_dhis-web-visualizer=Create dynamic data visualizations for data elements and indicators. intro_dhis-web-spreadsheet-reporting=Generate and import data based on predefined Excel templates. @@ -748,3 +748,4 @@ value_not_positive_integer=Data value is not a positive integer nepali=Nepali coptic=Coptic +dhis-web-settings=\u0e95\u0eb1\u0ec9\u0e87\u0e84\u0ec8\u0eb2 === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties 2015-10-15 14:07:18 +0000 @@ -541,7 +541,7 @@ india=\u1021\u102D\u1014\u1039\u1012\u102D\u101A\u1014\u102D\u102F\u1004\u103A\u1004\u1036 india=\u1021\u102D\u1014\u1039\u1012\u102D\u101A\u1014\u102D\u102F\u1004\u103A\u1004\u1036 indonesia=\u1021\u1004\u103A\u1012\u102D\u102F\u1014\u102E\u1038\u101B\u103E\u102C\u1038\u1014\u102D\u102F\u1004\u103A\u1004\u1036 -intro_dhis-web-maintenance-settings=\u1021\u1015\u103C\u1004\u103A\u1021\u1006\u1004\u103A\u104A \u101E\u1010\u102D\u1015\u1031\u1038\u1001\u103B\u1000\u103A\u1010\u102D\u102F\u1037\u1014\u103E\u1004\u103A\u1037\u101E\u1000\u103A\u1006\u102D\u102F\u1004\u103A\u101E\u1031\u102C \u1005\u1014\u1005\u103A\u1010\u100A\u103A\u1006\u1031\u102C\u1000\u103A\u1019\u103E\u102F\u1015\u102F\u1036\u1005\u1036\u1014\u103E\u1004\u103A\u1037\u1021\u101E\u102F\u1036\u1038\u1015\u103C\u102F\u101E\u1030\u1000\u102D\u102F\u1001\u103D\u1032\u1001\u103C\u102C\u1038\u1011\u102D\u1014\u103A\u1038\u101E\u102D\u1019\u103A\u1038\u1001\u103C\u1004\u103A\u1038 +intro_dhis-web-settings=\u1021\u1015\u103C\u1004\u103A\u1021\u1006\u1004\u103A\u104A \u101E\u1010\u102D\u1015\u1031\u1038\u1001\u103B\u1000\u103A\u1010\u102D\u102F\u1037\u1014\u103E\u1004\u103A\u1037\u101E\u1000\u103A\u1006\u102D\u102F\u1004\u103A\u101E\u1031\u102C \u1005\u1014\u1005\u103A\u1010\u100A\u103A\u1006\u1031\u102C\u1000\u103A\u1019\u103E\u102F\u1015\u102F\u1036\u1005\u1036\u1014\u103E\u1004\u103A\u1037\u1021\u101E\u102F\u1036\u1038\u1015\u103C\u102F\u101E\u1030\u1000\u102D\u102F\u1001\u103D\u1032\u1001\u103C\u102C\u1038\u1011\u102D\u1014\u103A\u1038\u101E\u102D\u1019\u103A\u1038\u1001\u103C\u1004\u103A\u1038 irc=\u1014\u102D\u102F\u1004\u103A\u1004\u1036\u1010\u1000\u102C\u1000\u101A\u103A\u1006\u101A\u103A\u101B\u1031\u1038\u1021\u1016\u103D\u1032\u1037 ivory_coast=\u1021\u102D\u102F\u1004\u103A\u1017\u101B\u102E\u1000\u102D\u102F\u1037\u1005\u103A\u1014\u102D\u102F\u1004\u103A\u1004\u1036 kenya=\u1000\u1004\u103A\u100A\u102C\u1014\u102D\u102F\u1004\u103A\u1004\u1036 @@ -620,4 +620,5 @@ offline=\u1021\u1004\u103A\u1010\u102C\u1014\u1000\u103A\u1014\u103E\u1004\u103A\u1037\u1019\u1001\u103B\u102D\u1010\u103A\u1006\u1000\u103A\u1011\u102C\u1038\u1015\u102B online=\u1021\u1004\u103A\u1010\u102C\u1014\u1000\u103A\u1014\u103E\u1004\u103A\u1037\u1001\u103B\u102D\u1010\u103A\u1006\u1000\u103A\u1011\u102C\u1038\u101E\u100A\u103A next=\u101B\u103E\u1031\u1037\u101E\u102D\u102F\u1037 -previous=\u1014\u1031\u102C\u1000\u103A\u101E\u102D\u102F\u1037 +previous=\u1014\u1031\u102C\u1000\u103A\u101E\u102D\u102F\u1037 +dhis-web-settings=\u1010\u1015\u103A\u1006\u1004\u103A/ \u1010\u100A\u103A\u1006\u1031\u102C\u1000\u103A\u1011\u102C\u1038\u101E\u100A\u103A\u1037\u1015\u102F\u1036\u1005\u1036 === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties 2015-10-15 14:07:18 +0000 @@ -10,7 +10,7 @@ dhis-web-appmanager=Aplica\u00E7\u00F5es weekday.tuesday=Ter\u00E7a-Feira retype_new_password=Reintroduza nova password -intro_dhis-web-maintenance-settings=Manter utilizador e configura\u00E7\u00F5es do sistema relacionados \u00E0 apar\u00EAncia, notifica\u00E7\u00F5es e muito mais. +intro_dhis-web-settings=Manter utilizador e configura\u00E7\u00F5es do sistema relacionados \u00E0 apar\u00EAncia, notifica\u00E7\u00F5es e muito mais. login_password=Password new=Novo not_equal_to=\!\= @@ -643,3 +643,4 @@ nationality=Nacionalidade update_access_denied_message=N\u00E3o tem permiss\u00F5es de actualiza\u00E7\u00E3o sobre o objecto please_enter_at_least_n_words=Por favor, introduza pelo menos {0} palavras. +dhis-web-settings=Configura\u00E7\u00F5es === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties 2015-10-15 14:07:18 +0000 @@ -11,7 +11,7 @@ no_page_specified=Nenhuma p\u00E1gina especificada weekday.tuesday=Ter\u00E7a-Feira retype_new_password=Reintroduza nova password -intro_dhis-web-maintenance-settings=Manter utilizador e configura\u00E7\u00F5es do sistema relacionados \u00E0 apar\u00EAncia, notifica\u00E7\u00F5es e muito mais. +intro_dhis-web-settings=Manter utilizador e configura\u00E7\u00F5es do sistema relacionados \u00E0 apar\u00EAncia, notifica\u00E7\u00F5es e muito mais. new=Novo not_equal_to=\!\= dhis-web-maintenance-in=Configura\u00E7\u00E3o @@ -605,3 +605,4 @@ nationality=Nacionalidade update_access_denied_message=N\u00E3o tem permiss\u00F5es de actualiza\u00E7\u00E3o sobre o objecto please_enter_at_least_n_words=Por favor, introduza pelo menos {0} palavras. +dhis-web-settings=Configura\u00E7\u00F5es === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties 2015-10-15 14:07:18 +0000 @@ -75,7 +75,7 @@ intro_dhis-web-maintenance-organisationunit = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439 \u0438 \u0438\u0445 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0438, \u0433\u0440\u0443\u043F\u043F \u0438 \u043D\u0430\u0431\u043E\u0440\u043E\u0432 \u0433\u0440\u0443\u043F\u043F intro_dhis-web-maintenance-user = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0432 \u0447\u0430\u0441\u0442\u0438 \u043F\u043E\u043B\u043D\u043E\u043C\u043E\u0447\u0438\u0439 \u0438 \u043F\u0430\u0440\u043E\u043B\u0435\u0439, \u0443\u0440\u043E\u0432\u043D\u0435\u0439 \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0438 \u0433\u0440\u0443\u043F\u043F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439. intro_dhis-web-maintenance-dataadmin = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u043D\u044B\u0445 \u0442\u0430\u0431\u043B\u0438\u0446, \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0446\u0435\u043B\u043E\u0441\u0442\u043D\u043E\u0441\u0442\u0438 \u0434\u0430\u043D\u043D\u044B\u0445, \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0438 \u0438 \u0442\u0430\u043A \u0434\u0430\u043B\u0435\u0435. -intro_dhis-web-maintenance-settings = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u044B, \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u0441 \u0432\u043D\u0435\u0448\u043D\u0438\u043C \u0432\u0438\u0434\u043E\u043C, \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u044F\u043C\u0438 \u0438 \u0442\u0430\u043A \u0434\u0430\u043B\u0435\u0435. +intro_dhis-web-settings = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439 \u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u044B, \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u0441 \u0432\u043D\u0435\u0448\u043D\u0438\u043C \u0432\u0438\u0434\u043E\u043C, \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u044F\u043C\u0438 \u0438 \u0442\u0430\u043A \u0434\u0430\u043B\u0435\u0435. intro_dhis-web-maintenance-patient = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u0431\u0435\u043D\u0435\u0444\u0438\u0446\u0438\u0430\u0440\u0438\u0435\u0432 \u0438 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B, \u0432\u043A\u043B\u044E\u0447\u0430\u044F \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044B \u0438 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u044B intro_dhis-web-maintenance-mobile = \u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0430\u0431\u043E\u0440\u043E\u0432 \u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u043B\u044E\u0441 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u043B\u044F \u043C\u043E\u0431\u0438\u043B\u044C\u043D\u043D\u043E\u0439 \u043E\u0442\u0447\u0435\u0442\u043D\u043E\u0441\u0442\u0438 \u0438 \u0421\u041C\u0421 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 intro_dhis-web-caseentry = \u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044F \u0431\u0435\u043D\u0435\u0444\u0438\u0446\u0438\u0430\u0440\u0438\u0435\u0432, \u0432\u0432\u043E\u0434 \u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u043E \u043A\u043E\u043D\u0442\u0430\u043A\u0442\u0430\u043C \u0438 \u0441\u043E\u0431\u044B\u0442\u0438\u044F\u043C, \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u043E\u0442\u0447\u0435\u0442\u043E\u0432. @@ -710,3 +710,4 @@ create_an_account = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0443\u0447\u0435\u0442\u043D\u0443\u044E \u0437\u0430\u043F\u0438\u0441\u044C wrong_username_or_password = \u041D\u0435\u0432\u0435\u0440\u043D\u043E\u0435 \u0438\u043C\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F \u0438\u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C powered_by = \u041D\u0430 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0435 +dhis-web-settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties 2015-03-30 09:51:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties 2015-10-15 14:07:18 +0000 @@ -77,7 +77,7 @@ intro_dhis-web-maintenance-organisationunit=Mantein unidades organizasionais ho nia ierarkia, grupus no konjuntu grupus. intro_dhis-web-maintenance-user=Mantein utilizadores ein termus de autoridades i se\u00F1as, kompetensias utilizador no grupus. intro_dhis-web-maintenance-dataadmin=Mantein tabela rekursus, verifika integridade dadus, har\u00E9 estat\u00EDstikas no seluk tan. -intro_dhis-web-maintenance-settings=Mantein utilizador no definisoens sitema ne'eb\u00E9 relasiona ho aparensia, notifikasaun no seluk tan. +intro_dhis-web-settings=Mantein utilizador no definisoens sitema ne'eb\u00E9 relasiona ho aparensia, notifikasaun no seluk tan. intro_dhis-web-maintenance-program=Mantein entidade no programas rastreadus inklui atributus no identifikadores. intro_dhis-web-maintenance-mobile=Mantein pakote dadus no m\u00F3s definisoens ba relat\u00F3riu m\u00F3vel no konfigurasaun SMS. intro_dhis-web-maintenance-appmanager=Asesu no hasae aplikasoens, ne'eb\u00E9 sai nudar extensaun ba interfase utilizador padraun. @@ -827,4 +827,5 @@ email_invite_2_1st_paragraph_before_application_title=Ne'e konvite atu kria email_invite_2_1st_paragraph_after_application_title=konta utilizador email_invite_2_2nd_paragraph=Haruka ona email rua ba itabo'ot, ida ne'e segundu email. Favor le primeiru email no halo tuir instrusoens ne'eb\u00E9 fo iha ne'eb\u00E1. Favor uza k\u00F3digu tuir mai ne'e atu kompleta formul\u00E1riu konta foun. -email_invite_2_3rd_paragraph=Itabo'ot tenki hat\u00E1n ba konvite ida ne'e iha fulan tolu nia laran. Se itabo'ot la halo buat ida, konvite ne'e sei expira iha tempu ne'eb\u00E1. \ No newline at end of file +email_invite_2_3rd_paragraph=Itabo'ot tenki hat\u00E1n ba konvite ida ne'e iha fulan tolu nia laran. Se itabo'ot la halo buat ida, konvite ne'e sei expira iha tempu ne'eb\u00E1. +dhis-web-settings=Konfigurasaun \ No newline at end of file === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties 2015-10-15 14:07:18 +0000 @@ -75,7 +75,7 @@ intro_dhis-web-maintenance-organisationunit = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3 \u0432\u0430 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u044F\u0438 \u043E\u043D\u04B3\u043E, \u0433\u0443\u0440\u04EF\u04B3\u04B3\u043E \u0432\u0430 \u043C\u0430\u04B7\u043C\u04EF\u0438 \u0433\u0443\u0440\u04EF\u04B3\u04B3\u043E. intro_dhis-web-maintenance-user = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438 \u043A\u043E\u0440\u0431\u0430\u0440\u043E\u043D \u0434\u0430\u0440 \u043C\u0430\u0432\u0440\u0438\u0434\u0438 \u0432\u0430\u043A\u043E\u043B\u0430\u0442\u04B3\u043E, \u043F\u0430\u0440\u043E\u043B\u04B3\u043E, \u0432\u0430\u0437\u0438\u0444\u0430\u04B3\u043E\u0438 \u043A\u043E\u0440\u0431\u0430\u0440\u043E\u043D \u0432\u0430 \u0433\u0443\u0440\u04EF\u04B3\u04B3\u043E. intro_dhis-web-maintenance-dataadmin = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438\u04B7\u0430\u0434\u0432\u0430\u043B\u04B3\u043E\u0438 \u0437\u0430\u0445\u0438\u0440\u0430\u0432\u04E3, \u0442\u0430\u0444\u0442\u0438\u0448\u0438 \u044F\u043A\u043F\u043E\u0440\u0447\u0430\u0433\u0438\u0438 \u0438\u0442\u0442\u0438\u043B\u043E\u043E\u0442, \u0434\u0438\u0434\u0430\u043D\u0438 \u043E\u043C\u043E\u0440 \u0432\u0430 \u0493\u0430\u0439\u0440\u0430. -intro_dhis-web-maintenance-settings = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438 \u0442\u0430\u043D\u0437\u0438\u043C\u043E\u0442\u0438 \u043A\u043E\u0440\u0431\u0430\u0440 \u0432\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430, \u043A\u0438 \u0431\u0430 \u043D\u0430\u043C\u0443\u0434\u0438 \u0437\u043E\u04B3\u0438\u0440\u04E3, \u043E\u0433\u043E\u04B3\u0438\u04B3\u043E \u0432\u0430 \u0493\u0430\u0439\u0440\u0430 \u043C\u0430\u0440\u0431\u0443\u0442\u0430\u043D\u0434. +intro_dhis-web-settings = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438 \u0442\u0430\u043D\u0437\u0438\u043C\u043E\u0442\u0438 \u043A\u043E\u0440\u0431\u0430\u0440 \u0432\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430, \u043A\u0438 \u0431\u0430 \u043D\u0430\u043C\u0443\u0434\u0438 \u0437\u043E\u04B3\u0438\u0440\u04E3, \u043E\u0433\u043E\u04B3\u0438\u04B3\u043E \u0432\u0430 \u0493\u0430\u0439\u0440\u0430 \u043C\u0430\u0440\u0431\u0443\u0442\u0430\u043D\u0434. intro_dhis-web-maintenance-patient = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438 \u043C\u0430\u043D\u0444\u0438\u0430\u0442\u0433\u0438\u0440\u0430\u043D\u0434\u0430\u0433\u043E\u043D \u0432\u0430 \u0431\u0430\u0440\u043D\u043E\u043C\u0430\u04B3\u043E, \u0430\u0437 \u04B7\u0443\u043C\u043B\u0430 \u043D\u0438\u0448\u043E\u043D\u04B3\u043E \u0432\u0430 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u04B3\u043E. intro_dhis-web-maintenance-mobile = \u041D\u0438\u0433\u043E\u04B3\u0434\u043E\u0440\u0438\u0438 \u043C\u0430\u04B7\u043C\u04EF\u044A\u04B3\u043E\u0438 \u0438\u0442\u0442\u0438\u043B\u043E\u043E\u0442 \u0431\u043E \u0438\u043B\u043E\u0432\u0430\u0438 \u0442\u0430\u043D\u0437\u0438\u043C\u043E\u0442 \u0431\u0430\u0440\u043E\u0438 \u04B3\u0438\u0441\u043E\u0431\u043E\u0442\u0434\u0438\u04B3\u0438\u0438 \u043C\u043E\u0431\u0438\u043B\u04E3 \u0432\u0430 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0442\u0441\u0438\u044F\u0438 \u0421\u041C\u0421. intro_dhis-web-caseentry = \u0411\u0430\u049B\u0430\u0439\u0434\u0433\u0438\u0440\u0438\u0438 \u043C\u0430\u043D\u0444\u0438\u0430\u0442\u0433\u0438\u0440\u0430\u043D\u0434\u0430\u0433\u043E\u043D, \u0432\u043E\u0440\u0438\u0434 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u0438\u0442\u0442\u0438\u043B\u043E\u043E\u0442 \u0434\u0430\u0440 \u0431\u043E\u0440\u0430\u0438 \u0432\u043E\u049B\u0435\u0430\u04B3\u043E \u0432\u0430 \u0440\u04EF\u0439\u0434\u043E\u0434\u04B3\u043E \u0432\u0430 \u043D\u0430\u043C\u043E\u0438\u0448 \u0434\u043E\u0434\u0430\u043D\u0438 \u04B3\u0438\u0441\u043E\u0431\u043E\u0442\u04B3\u043E. @@ -710,3 +710,4 @@ create_an_account = \u0421\u043E\u0445\u0442\u0430\u043D\u0438 \u04B3\u0438\u0441\u043E\u0431 wrong_username_or_password = \u041F\u0430\u0440\u043E\u043B \u0451 \u043D\u043E\u043C\u0438 \u043A\u043E\u0440\u0431\u0430\u0440\u0438 \u0445\u0430\u0442\u043E powered_by = \u041F\u0435\u0448\u043D\u0438\u04B3\u043E\u0434 \u0430\u0437 +dhis-web-settings=\u0422\u0430\u043D\u0437\u0438\u043C\u043E\u0442 === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties 2015-06-02 07:37:42 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties 2015-10-15 14:07:18 +0000 @@ -82,7 +82,7 @@ intro_dhis-web-maintenance-organisationunit=Qu\u1ea3n l\u00fd c\u00e1c \u0111\u01a1n v\u1ecb v\u00e0 nh\u00e1nh \u0111\u01a1n v\u1ecb, c\u00e1c nh\u00f3m v\u00e0 c\u00e1c t\u1eadp h\u1ee3p nh\u00f3m intro_dhis-web-maintenance-user=Qu\u1ea3n l\u00fd ng\u01b0\u1eddi d\u00f9ng theo c\u00e1c \u0111i\u1ec1u kho\u1ea3n, quy\u1ec1n h\u1ea1n, m\u1eadt kh\u1ea9u v\u00e0 theo nh\u00f3m intro_dhis-web-maintenance-dataadmin=Qu\u1ea3n l\u00fd c\u00e1c b\u1ea3ng t\u00e0i nguy\u00ean, ki\u1ec3m tra t\u00ednh r\u00e0ng bu\u1ed9c d\u1eef li\u1ec7u, xem s\u1ed1 li\u1ec7u th\u1ed1ng k\u00ea v\u00e0 c\u00f2n nhi\u1ec1u th\u1ee9 kh\u00e1c -intro_dhis-web-maintenance-settings=Qu\u1ea3n l\u00fd c\u00e1c thi\u1ebft l\u1eadp cho ng\u01b0\u1eddi d\u00f9ng v\u00e0 h\u1ec7 th\u1ed1ng c\u00f3 li\u00ean v\u1ec1 giao di\u1ec7n, th\u00f4ng b\u00e1o v\u00e0 nhi\u1ec1u ch\u1ee9c n\u0103ng kh\u00e1c. +intro_dhis-web-settings=Qu\u1ea3n l\u00fd c\u00e1c thi\u1ebft l\u1eadp cho ng\u01b0\u1eddi d\u00f9ng v\u00e0 h\u1ec7 th\u1ed1ng c\u00f3 li\u00ean v\u1ec1 giao di\u1ec7n, th\u00f4ng b\u00e1o v\u00e0 nhi\u1ec1u ch\u1ee9c n\u0103ng kh\u00e1c. intro_dhis-web-maintenance-program=Qu\u1EA3n l\u00FD theo d\u00F5i c\u00E1 th\u1EC3 v\u00E0 c\u00E1c ch\u01B0\u01A1ng tr\u00ECnh bao g\u1ED3m c\u00E1c thu\u1ED9c t\u00EDnh v\u00E0 s\u1ED1 \u0111\u1ECBnh danh. intro_dhis-web-maintenance-mobile=Qu\u1ea3n l\u00fd t\u1eadp thi\u1ebft l\u1eadp d\u1eef li\u1ec7u b\u1ed5 sung cho b\u00e1o c\u00e1o qua thi\u1ebft b\u1ecb di \u0111\u1ed9ng v\u00e0 c\u1ea5u h\u00ecnh SMS intro_dhis-web-maintenance-appmanager=Truy c\u1EADp v\u00E0 \u0111\u0103ng t\u1EA3i c\u00E1c \u1EE9ng d\u1EE5ng, g\u1ED3m c\u00E1c \u1EE9ng d\u1EE5ng m\u1EDF r\u1ED9ng c\u00F3 giao di\u1EC7n chu\u1EA9n \u0111\u1ED1i v\u1EDBi ng\u01B0\u1EDDi d\u00F9ng. @@ -956,3 +956,4 @@ email_invite_2_1st_paragraph_after_application_title=T\u00E0i kho\u1EA3n ng\u01B0\u1EDDi d\u00F9ng. email_invite_2_2nd_paragraph=H\u1EC7 th\u1ED1ng \u0111\u00E3 g\u1EEDi cho b\u1EA1n hai th\u01B0 \u0111i\u1EC7n t\u1EED, \u0111\u00E2y l\u00E0 th\u01B0 th\u1EE9 hai. H\u00E3y \u0111\u1ECDc th\u01B0 th\u1EE9 nh\u1EA5t v\u00E0 l\u00E0m theo h\u01B0\u1EDBng d\u1EABn. H\u00E3y d\u00F9ng m\u00E3 ph\u00EDa d\u01B0\u1EDBi \u0111\u1EC3 ho\u00E0n th\u00E0nh vi\u1EC7c t\u1EA1o t\u00E0i kho\u1EA3n m\u1EDBi. email_invite_2_3rd_paragraph=B\u1EA1n ph\u1EA3i tr\u1EA3 l\u1EDDi th\u01B0 m\u1EDDi n\u00E0y trong v\u00F2ng 3 th\u00E1ng. N\u1EBFu b\u1EA1n kh\u00F4ng l\u00E0m g\u00EC, th\u01B0 m\u1EDDi s\u1EBD t\u1EF1 h\u1EE7y ngay khi h\u1EBFt h\u1EA1n. +dhis-web-settings=C\u00e1c thi\u1ebft l\u1eadp === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties 2014-07-06 17:12:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties 2015-10-15 14:07:18 +0000 @@ -403,7 +403,7 @@ int=\u6570\u5B57 translation_add=\u6DFB\u52A0 less_than=< -intro_dhis-web-maintenance-settings=\u7EF4\u62A4\u7528\u6237\u548C\u7CFB\u7EDF\u8BBE\u7F6E\u76F8\u5173\u7684\u5916\u89C2\u3001\u901A\u77E5\u7B49\u7B49 +intro_dhis-web-settings=\u7EF4\u62A4\u7528\u6237\u548C\u7CFB\u7EDF\u8BBE\u7F6E\u76F8\u5173\u7684\u5916\u89C2\u3001\u901A\u77E5\u7B49\u7B49 unselect_all=\u53D6\u6D88\u5168\u90E8\u9009\u62E9 save=\u4FDD\u5B58 select_at_level=\u540C\u7EA7\u9009\u62E9 @@ -525,3 +525,4 @@ ghana=\u52A0\u7EB3 togo=\u591A\u54E5 norway=\u632A\u5A01 +dhis-web-settings=\u7CFB\u7EDF\u8BBE\u7F6E === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2015-06-11 18:44:52 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2015-10-15 14:07:18 +0000 @@ -69,5 +69,11 @@ index.html + + + + index.html + + === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html 2015-06-11 18:44:52 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html 2015-10-15 14:07:18 +0000 @@ -3,6 +3,7 @@

Apps